From 6e72fefa24ed3caeb6a9ab33660e51fec6ea871a Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 19 Sep 2022 13:41:49 -0700 Subject: [PATCH] Chore: Update Centos7/Ubuntu18.04 nodes - Update nodes to install JDK11 to be able to support the newest Jenkins migration - Update Ubuntu nodes with JDK17 for CCSDK support Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: If147ff97600f6877efa8247ad402bb785dd70861 --- jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index 1b3d97cbb..38f914e84 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234 LABELS=centos7-builder-2c-1g HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index 43361f810..a2cdcaaa6 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234 LABELS=centos7-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index d8ca72675..4567d1ed5 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261 LABELS=centos7-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 284de63e7..1db2ade6a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220829-213803.583 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220919-172301.743 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index 7232133b7..8b1e954f8 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v3-standard-16 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index 986d81ec9..646668542 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index a137662cd..1545bbf1c 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020 LABELS=ubuntu1804-docker-v1-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg index 6da3a5018..2f7b62ae7 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220829-213839.699 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220919-172402.717 LABELS=ubuntu1804-helm-2c-1g HARDWARE_ID=v3-standard-4 -- 2.16.6