From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 1 Apr 2021 19:18:04 +0000 (-0700)
Subject: Replace ubuntu1604 with ubuntu1804
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=85a3acbbf3b0726bb3241be911334b2aa7efe094;p=ci-management.git

Replace ubuntu1604 with ubuntu1804

Replace the agent and all scripts that reference it.

Issue: LF-Jira RELENG-3483
Change-Id: Iffe5d0a2a0a2dc50ccb20f5d32a9bcc3c5b7fcca
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
deleted file mode 100644
index e82dc69..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190110-225527.869
-HARDWARE_ID=v2-highcpu-8
-VOLUME_SIZE=50
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
new file mode 100644
index 0000000..d264b8c
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210401-001638.539
+HARDWARE_ID=v2-highcpu-8
+VOLUME_SIZE=50
diff --git a/jjb/akraino-templates/akraino-iec-macros.yaml b/jjb/akraino-templates/akraino-iec-macros.yaml
index 8c2e20d..950d867 100644
--- a/jjb/akraino-templates/akraino-iec-macros.yaml
+++ b/jjb/akraino-templates/akraino-iec-macros.yaml
@@ -27,8 +27,8 @@
           description: Artifacts to archive to the logs server.
 
 # Usecase params are both installer and OS specific
-- parameter: &k8s_fuel_ubuntu1604_parameter
-    name: 'fuel-ubuntu1604-defaults'
+- parameter: &k8s_fuel_ubuntu1804_parameter
+    name: 'fuel-ubuntu1804-parameters'
     parameters:
       - string: &k8s_master_ip
           name: K8S_MASTER_IP
@@ -48,7 +48,7 @@
           description: 'SSH key to connect to the K8s master'
 
 - parameter:
-    <<: *k8s_fuel_ubuntu1604_parameter
+    <<: *k8s_fuel_ubuntu1804_parameter
     name: 'fuel-ubuntu1804-defaults'
 - parameter:
     name: 'fuel-centos7-defaults'
@@ -64,7 +64,7 @@
           <<: *k8s_ssh_key
 
 - parameter:
-    name: 'compass-ubuntu1604-defaults'
+    name: 'compass-ubuntu1804-defaults'
     parameters:
       - string:
           <<: *k8s_master_ip
@@ -96,14 +96,6 @@
 # ----------------------------------------------------------------
 # Akraino IEC CI Baremetal Triggers running against master branch
 # ----------------------------------------------------------------
-- trigger:
-    name: 'iec-type2-fuel-virtual-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: '0 1 * * 1,3,5'
-- trigger:
-    name: 'iec-type2-compass-virtual-ubuntu1604-daily-master-trigger'
-    triggers:
-      - timed: '0 13 * * *'
 - trigger:
     name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger'
     triggers:
@@ -117,6 +109,6 @@
     triggers:
       - timed: '0 1 * * 4,7'
 - trigger:
-    name: 'iec-type1-compass-virtual-ubuntu1604-daily-master-trigger'
+    name: 'iec-type1-compass-virtual-ubuntu1804-daily-master-trigger'
     triggers:
       - timed: '0 19 * * *'
diff --git a/jjb/akraino-templates/akraino-validation-templates.yaml b/jjb/akraino-templates/akraino-validation-templates.yaml
index c84e4c4..4cd18a8 100644
--- a/jjb/akraino-templates/akraino-validation-templates.yaml
+++ b/jjb/akraino-templates/akraino-validation-templates.yaml
@@ -91,7 +91,7 @@
 - job-template:
     id: akraino-validation-docker-manifest
     name: 'validation-docker-manifest-{stream}'
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     build-timeout: 15
 
     parameters:
diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml
index 5e1d5e6..31e4eb5 100644
--- a/jjb/camunda_workflow/camunda_workflow-docker.yaml
+++ b/jjb/camunda_workflow/camunda_workflow-docker.yaml
@@ -19,7 +19,7 @@
     project-name: camunda_workflow
     project: camunda_workflow
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 3e8c3b8..78b1c2d 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -27,7 +27,6 @@
     # OPERATING SYSTEM DEFINITIONS
     # -------------------------------
     os:
-      - ubuntu1604
       - ubuntu1804
       - centos7
     #--------------------------------
@@ -65,7 +64,7 @@
         os: centos7
       - installer: fuel
         deploy_type: baremetal
-        os: ubuntu1604
+        os: ubuntu1804
       # SEBA on virtual PODs should be excluded
       - deploy_type: virtual
         usecase: seba_on_arm
diff --git a/jjb/portal_user_interface/portal-onapsdk-docker.yaml b/jjb/portal_user_interface/portal-onapsdk-docker.yaml
index bdadcf5..5e57fa3 100644
--- a/jjb/portal_user_interface/portal-onapsdk-docker.yaml
+++ b/jjb/portal_user_interface/portal-onapsdk-docker.yaml
@@ -19,7 +19,7 @@
     project: 'portal_user_interface/portal-onapsdk'
     name: portal_user_interface-portal-onapsdk-docker
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml
index 38536a6..2f45d70 100644
--- a/jjb/portal_user_interface/portal_user_interface-docker.yaml
+++ b/jjb/portal_user_interface/portal_user_interface-docker.yaml
@@ -19,7 +19,7 @@
     project-name: portal_user_interface
     project: portal_user_interface
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml
index d5ec9b8..f32ee71 100644
--- a/jjb/postgres_db_schema/postgres_db_schema.yaml
+++ b/jjb/postgres_db_schema/postgres_db_schema.yaml
@@ -19,7 +19,7 @@
     project-name: postgres_db_schema
     project: postgres_db_schema
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/redfish/redfish-docker.yaml b/jjb/redfish/redfish-docker.yaml
index fa25a4e..66e2bc8 100644
--- a/jjb/redfish/redfish-docker.yaml
+++ b/jjb/redfish/redfish-docker.yaml
@@ -19,7 +19,7 @@
     project-name: redfish
     project: redfish
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/regional_controller/api-server-docker.yaml b/jjb/regional_controller/api-server-docker.yaml
index db6e2f3..c171775 100644
--- a/jjb/regional_controller/api-server-docker.yaml
+++ b/jjb/regional_controller/api-server-docker.yaml
@@ -19,7 +19,7 @@
     project: 'regional_controller/api-server'
     project-name: regional_controller-api-server
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
diff --git a/jjb/ta/remote-installer.yaml b/jjb/ta/remote-installer.yaml
index 1f343c2..176cffe 100644
--- a/jjb/ta/remote-installer.yaml
+++ b/jjb/ta/remote-installer.yaml
@@ -4,7 +4,7 @@
     project: ta/remote-installer
     project-name: ta-remote-installer
     global-settings-file: global-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream: master
     java-version: openjdk8
     mvn-version: mvn35
@@ -17,4 +17,3 @@
     jobs:
       - 'akraino-project-stream-docker'
       - 'akraino-project-stream-stage-docker'
-
diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index 539ed75..7a99536 100644
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -1,3 +1,4 @@
+---
 - project:
 
     name: validation-docker
@@ -32,7 +33,7 @@
 
     arch_tag:
       - 'amd64':
-          slave_label: 'ubuntu1604-docker-8c-8g'
+          slave_label: 'ubuntu1804-docker-8c-8g'
       - 'arm64':
           slave_label: 'aarch64_build'
 
diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json
index 791bfb3..3ae57d5 100644
--- a/packer/vars/ubuntu-18.04-arm64.json
+++ b/packer/vars/ubuntu-18.04-arm64.json
@@ -4,7 +4,7 @@
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
   "distro": "Ubuntu 18.04",
   "flavor": "v2-standard-1",
-  "source_ami_filter_name": "*ubuntu*16.04*",
+  "source_ami_filter_name": "*ubuntu*18.04*",
   "source_ami_filter_owner": "099720109477",
   "ssh_user": "ubuntu",
   "vm_use_block_storage": "true"