ci: Revert all cattle to v2 hardware

It seems that v3 has different hardware IDs between YUL and SJC,
which breaks o-ran's config (since everything is standardized on YUL).
We should be able to fix the root issue, but for now, moving to v2
will stabilize the project.

Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I4de21ca7bbda5e4206dae1ecedb0737f871daff4

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 439cfe2..3ba1f3b 100644 (file)
--- 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=v3-starter-1
+HARDWARE_ID=v2-highcpu-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 d3d829b..d43b448 100644 (file)
--- 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=v3-standard-2
+HARDWARE_ID=v2-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 bac3777..a8c7f6b 100644 (file)
--- 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=v3-standard-2
+HARDWARE_ID=v2-standard-2
 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 94d9c45..37ebec5 100644 (file)
--- 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=v3-starter-2
+HARDWARE_ID=v2-highcpu-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 4c232fb..624f3f6 100644 (file)
--- 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=v3-starter-2
+HARDWARE_ID=v2-highcpu-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 35bcedb..17f8906 100644 (file)
--- 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=v3-starter-4
+HARDWARE_ID=v2-highcpu-4
 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 31f77c3..3142ebd 100644 (file)
--- 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=v3-starter-4
+HARDWARE_ID=v2-highcpu-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 fff570a..fcf6ea6 100644 (file)
--- 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=v3-starter-2
+HARDWARE_ID=v2-highcpu-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 5d5c801..445d6ec 100644 (file)
--- 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=v3-starter-4
+HARDWARE_ID=v2-highcpu-4
 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 414da2e..5761a5b 100644 (file)
--- 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=v3-standard-4
+HARDWARE_ID=v2-standard-4

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 99e75ae..9fde84c 100644 (file)
--- 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=v3-standard-4
+HARDWARE_ID=v2-standard-4