Chore: Update all builders to v3 flavors

Change-Id: I9b206d1cfc186ea36af2a7b8d1536684f2aaa5d0
Issue-ID: LF-Jira RELENG-4036
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

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 f19c966..ef9438d 100644 (file)
--- 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,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-highcpu-1
-VOLUME_SIZE=20
+HARDWARE_ID=v3-starter-1

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
index b23de2d..6a226f9 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
@@ -1,3 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-standard-2
-VOLUME_SIZE=20
+HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
index d8ce039..46f55aa 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg
@@ -1,3 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-standard-4
-VOLUME_SIZE=20
+HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
index af5853c..c67f8a7 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
@@ -1,3 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-highcpu-32
-VOLUME_SIZE=20
+HARDWARE_ID=v3-starter-32

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
index b9d9800..b077fe1 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg
@@ -1,3 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-highcpu-8
-VOLUME_SIZE=20
+HARDWARE_ID=v3-starter-8

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 822f528..e2e57b0 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -5,11 +5,11 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275
-HARDWARE_ID=v2-highcpu-1
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770
+HARDWARE_ID=v3-starter-1
 NETWORK_ID=e84c8d94-1d74-4593-b24f-9a091cd3b9bf
 USER_DATA_ID=jenkins-init-script
-INSTANCE_CAP=10
+INSTANCE_CAP=40
 SANDBOX_CAP=4
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
@@ -19,4 +19,3 @@ NUM_EXECUTORS=1
 JVM_OPTIONS=
 FS_ROOT=/w
 RETENTION_TIME=0
-VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg
index 4b1a29b..88edd24 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu18.04-docker-arm64-8c-8g.cfg
@@ -1,4 +1,3 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191204-002552.777
-HARDWARE_ID=v2-highcpu-8
-VOLUME_SIZE=50
+HARDWARE_ID=v3-standard-8
 LABELS=aarch64_build aarch64_dev

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 d264b8c..de69ee9 100644 (file)
--- 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,2 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210401-001638.539
-HARDWARE_ID=v2-highcpu-8
-VOLUME_SIZE=50
+HARDWARE_ID=v3-starter-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
index 761c96f..0e20e6b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg
@@ -1,3 +1,2 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20191207-002613.424
-HARDWARE_ID=v2-highcpu-32
-VOLUME_SIZE=20
+HARDWARE_ID=v3-starter-32