From: Eric Ball Date: Tue, 17 Jun 2025 22:59:17 +0000 (-0700) Subject: CI: Update cloud configs, ci-man jobs to v3 agents X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F14569%2F1;p=ci-management.git CI: Update cloud configs, ci-man jobs to v3 agents This includes the following related changes: * Update all agent configs to use v3 nodes (replacing v2-highcpu with v3-starter) * Remove unused agents centos8-builder-1c-1g and ubuntu1804-2c-8g * Rename the (previously unused) centos8-builder-2c-2g to be 2c-4g to properly reflect the system it is now using * Switch ci-jobs and ci-packer jobs to the 2c-4g agents. These were previously set to use an undefined agent. Issue-ID: LF-Jira IT-28322 Signed-off-by: Eric Ball Change-Id: Ife2496060fee1ed985413afb3343818ebf70c5e2 --- diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index 3ba1f3b5..439cfe21 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-builder-1c-1g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240201-210113.228 -HARDWARE_ID=v2-highcpu-1 +HARDWARE_ID=v3-starter-1 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index d43b448a..d3d829bf 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g-200g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240207-020748.713 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=200 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index a8c7f6be..bac37778 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240207-020748.713 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-2g.cfg deleted file mode 100644 index 6d37bac4..00000000 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-2g.cfg +++ /dev/null @@ -1,4 +0,0 @@ -LABELS=centos8-builder-2c-2g -IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240101-220121.191 -VOLUME_SIZE=20 -HARDWARE_ID=v2-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg similarity index 62% rename from jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg rename to jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg index 226e46c4..94d9c45a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg @@ -1,4 +1,4 @@ -LABELS=centos8-builder-1c-1g +LABELS=centos8-builder-2c-4g IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240101-220121.191 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-1 +HARDWARE_ID=v3-starter-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index 624f3f6c..4c232fb5 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-2c-2g IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20240101-050208.546 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2 VOLUME_SIZE=20 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 17f89066..35bcedb2 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-4c-4g IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-2c-8g.cfg deleted file mode 100644 index 074508e5..00000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-2c-8g.cfg +++ /dev/null @@ -1,4 +0,0 @@ -LABELS=ubuntu1804-docker-2c-8g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240207-020748.956 -HARDWARE_ID=v2-highcpu-4 -VOLUME_SIZE=80 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index 3142ebd0..31f77c33 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-docker-4c-4g IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240207-020748.956 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg index fcf6ea65..fff570a9 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu2004-builder-2c-2g IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20240101-020156.263 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg index 445d6ec7..5d5c801a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu2004-builder-4c-4g IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20240101-020156.263 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4 VOLUME_SIZE=20 diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml index e46f9753..c2a6bf3a 100644 --- a/jjb/ci-management/ci-jobs.yaml +++ b/jjb/ci-management/ci-jobs.yaml @@ -5,7 +5,7 @@ project: ci-management project-name: ci-management - build-node: centos8-builder-2c-1g + build-node: centos8-builder-2c-4g - project: name: ci-jobs diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml index 9954d877..535ce83f 100644 --- a/jjb/ci-management/ci-packer.yaml +++ b/jjb/ci-management/ci-packer.yaml @@ -5,7 +5,7 @@ project: ci-management project-name: ci-management - build-node: centos8-builder-2c-1g + build-node: centos8-builder-2c-4g build-timeout: 90 cron: "00 H 1 * *" packer-cloud-settings: packer-cloud-env-hcl