summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2021-03-29 15:26:34 -0500
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2021-03-29 15:26:34 -0500
commitfd0c0a37be85ed92b95581375335d48d62aa7237 (patch)
tree6446593c92e9a081f08637e762d8c9d3a8c7440a
parent1a5efba072c8a9ccf5c7fe884f10037f3fba9444 (diff)
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 <vvalderrama@linuxfoundation.org> Change-Id: I92c25c86b368546cf0ef8db05c2ed832a99b82c1
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-v3-4c-4g4
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg2
4 files changed, 3 insertions, 7 deletions
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 b08b4fb3..cf844cd2 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 26cf4d60..0b62d1ab 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 0b62d1ab..00000000
--- 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 f0c8fad1..7b8aa5bf 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