From: Eric Ball Date: Fri, 11 Jul 2025 22:14:12 +0000 (-0700) Subject: Switch all cattle to sjc flavors X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=f2b97c7ac5e46c2e691230b3a7f659e8e036bf80;p=ci-management.git Switch all cattle to sjc flavors The issue we had before was with hardware name-to-ID mappings being different for SJC. We have included these in the latest version of global-jjb as "-sjc" flavors, which will correctly map to the IDs of these nodes in SJC. Signed-off-by: Eric Ball Change-Id: I464e025692336c3bc034b56a0b504442a4b8316a --- 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..5f12e7be 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-sjc 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..236f382c 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-sjc 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..99409ecf 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-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg index 37ebec5a..77421478 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg @@ -1,4 +1,4 @@ LABELS=centos8-builder-2c-4g IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240101-220121.191 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2-sjc diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2a5ddafb..65f210eb 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -7,7 +7,7 @@ CLOUD_ZONE=sjc1 # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-210122.874 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-1 +HARDWARE_ID=v3-starter-1-sjc NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec USER_DATA_ID=jenkins-init-script INSTANCE_CAP=10 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..2880f442 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-sjc 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..ce4c50c3 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-sjc VOLUME_SIZE=20 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..614a1372 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-sjc 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..ddb0e788 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-sjc 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..a50051dc 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-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg index 5761a5b4..229ce4d9 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu2004-devstack-4c-16g IMAGE_NAME=ZZCI - Ubuntu 20.04 - devstack - x86_64 - 20230913-095841.255 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4-sjc diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg index 9fde84ce..3da924b6 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu2204-devstack-4c-16g IMAGE_NAME=ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4-sjc