From: Vanessa Rene Valderrama Date: Mon, 29 Mar 2021 20:26:34 +0000 (-0500) Subject: Modify executor flavors X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F31819%2F1;p=ci-management.git Modify executor flavors Modifying the executors to use the new V3 flavors which will improve performance and are more cost efficient. Tested in production using the centos7-v3-4c-4g template which can now be removed. Signed-off-by: Vanessa Rene Valderrama Change-Id: I92c25c86b368546cf0ef8db05c2ed832a99b82c1 --- diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg index b08b4fb38..cf844cd28 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg index 26cf4d602..0b62d1abc 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-4c-4g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-v3-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-v3-4c-4g deleted file mode 100644 index 0b62d1abc..000000000 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-v3-4c-4g +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 -LABELS=centos7-builder-4c-4g -HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index f0c8fad11..7b8aa5bf6 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -8,7 +8,7 @@ OS_CLOUD=vexci # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system INSTANCE_CAP=20