Chore: Upgrade helm jobs

- Upgrade 20.04 image
- Migrate helm jobs to Ubuntu 20.04
- Remove deprecated node

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ia20cc96cbb7da31146d95319be5ea27b097b1390

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
deleted file mode 100644 (file)
index fd98ad0..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20230329-210041.650
-LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
index a55f55f..ccef6ab 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20230329-210733.748
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20230405-210810.069
 LABELS=ubuntu2004-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 6a38faa..0f81426 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -6,7 +6,7 @@
     archive-artifacts: ""
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
-    build-node: ubuntu1804-helm-2c-1g
+    build-node: ubuntu2004-helm-2c-1g
     helm_bin: helm3.8
     pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh
 
@@ -43,7 +43,7 @@
     project-name: oom
     project: oom
     archive-artifacts: ""
-    build-node: ubuntu1804-helm-2c-1g
+    build-node: ubuntu2004-helm-2c-1g
     helm_bin: helm3.10.2
     pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh