From c833bde013f9172163746e7c7f1c37465553a811 Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Fri, 12 Mar 2021 15:17:25 -0600 Subject: 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 Change-Id: I74bdda1e2be2a42e0927e8bd4243dd2b495e3cef --- jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg | 2 +- .../clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'jenkins-config/clouds') 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 ec1d18ac0..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-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 4b7974d0c..3d0de1e72 100644 --- 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 1a2f361fc..e23628812 100644 --- 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 b78877254..caae37aea 100644 --- 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 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 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 e7e86ebdd..9677c8726 100644 --- 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 e10ae422f..35e7ad980 100644 --- 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 7e763360e..0ac5a9abe 100644 --- 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 fc52ef219..ab77b0faa 100644 --- 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 597c0b4ac..0eea568ea 100644 --- 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 ec72efa84..f608ab4cf 100644 --- 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 618b1fa03..b16259d81 100644 --- 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 23df2a643..12ed334a7 100644 --- 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 d4be182b2..eebda9e49 100644 --- 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 789129e0a..b2cb36567 100644 --- 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 -- cgit 1.2.3-korg