Modify executor flavors

Modifying the executors to use the new V3 flavors which will improve
performance and are more cost efficient.

Signed-off-by: Vanessa Rene Valderrama <[email protected]>
Change-Id: I74bdda1e2be2a42e0927e8bd4243dd2b495e3cef

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 b08b4fb..cf844cd 100644 (file)
--- 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 ec1d18a..0b62d1a 100644 (file)
--- 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-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
index 4b7974d..3d0de1e 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
 LABELS=centos7-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg
index 1a2f361..e236288 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230
 LABELS=centos7-docker-2c-2g
-HARDWARE_ID=v2-standard-2
+HARDWARE_ID=v3-standard-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
index b788772..caae37a 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230
 LABELS=centos7-docker-4c-4g
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index f0c8fad..7b8aa5b 100644 (file)
--- 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

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
index e7e86eb..9677c87 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-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/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
index e10ae42..35e7ad9 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
index 7e76336..0ac5a9a 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-8c-32g
-HARDWARE_ID=v2-highcpu-32
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
index fc52ef2..ab77b0f 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109
 LABELS=ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
index 597c0b4..0eea568 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200510-225624.603
 LABELS=ubuntu1604-docker-4c-4g
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
index ec72efa..f608ab4 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-2c-2g.cfg
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
index 618b1fa..b16259d 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
index 23df2a6..12ed334 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173
 LABELS=ubuntu1804-builder-8c-8g.cfg
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
 VOLUME_SIZE=40

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg
index d4be182..eebda9e 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200107-191807.978
 LABELS=ubuntu1804-docker-4c-4g
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g
index 789129e..b2cb365 100644 (file)
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g
@@ -1,5 +1,5 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191209-185146.016
 LABELS=ubuntu1804arm-docker-4c-4g
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=v3-standard-4
 VOLUME_SIZE=20