summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2023-04-10 19:49:26 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2023-04-10 20:13:53 -0700
commit59ee068d6cd2a6dfc99e60cecbfddcf31ef9d29c (patch)
treeb3e1cd1d2581859a262e5d80b05541eb5bc1215f
parentba941f8b5e346d71765b382cda832a82e383898b (diff)
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
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg3
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg2
-rw-r--r--jjb/oom/oom-helm.yaml4
3 files changed, 3 insertions, 6 deletions
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
index fd98ad0a7..000000000
--- 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 a55f55f07..ccef6ab53 100644
--- 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 6a38faa63..0f8142658 100644
--- 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