From 5c5b1d6da398778eb2c1924657b76fb1ca52dbc4 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Wed, 10 Nov 2021 13:02:20 -0800 Subject: [PATCH] Fix: Move all builders to standard, update images The v3-starter flavors have too small of a default disk attached for our images. Change-Id: I3e5125df3ab9c14894e6aba55bd312d1373ab081 Signed-off-by: Eric Ball --- jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/cloud.cfg | 4 ++-- jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg | 4 ++-- 5 files changed, 7 insertions(+), 7 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 ef9438d..c00655a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 -HARDWARE_ID=v3-starter-1 +HARDWARE_ID=v3-standard-1 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 c67f8a7..fd9ede5 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 -HARDWARE_ID=v3-starter-32 +HARDWARE_ID=v3-standard-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 b077fe1..82e2ceb 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 -HARDWARE_ID=v3-starter-8 +HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index e2e57b0..d643f68 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,8 +5,8 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 -HARDWARE_ID=v3-starter-1 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132154.275 +HARDWARE_ID=v3-standard-1 NETWORK_ID=e84c8d94-1d74-4593-b24f-9a091cd3b9bf USER_DATA_ID=jenkins-init-script INSTANCE_CAP=40 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 0e20e6b..95ead86 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-8c-32g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20191207-002613.424 -HARDWARE_ID=v3-starter-32 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20200727-130627.472 +HARDWARE_ID=v3-standard-32 -- 2.16.6