Modify OpenStack templates

Switching the OpenStack templates used by CI mgmt jobs back to V2
flavors due to problems with the V3 flavors in production. Modifying the
INFO.yaml job to use a template with a V3 flavor to continue
troubleshooting the issue in production because this issue can't be
reproduced on the sandbox.

Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Change-Id: Ibc8e744e3201538122965a70ab0f23ca3fe66371

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 cf844cd..b08b4fb 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=v3-standard-2
+HARDWARE_ID=v2-highcpu-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 0b62d1a..ec1d18a 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=v3-standard-4
+HARDWARE_ID=v2-highcpu-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 7b8aa5b..f0c8fad 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=v3-standard-2
+HARDWARE_ID=v2-highcpu-2
 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03
 USER_DATA_ID=jenkins-init-system
 INSTANCE_CAP=20

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index f33e6e9..762a4ff 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -27,6 +27,6 @@
     project-name: ci-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-8c-8g
     project: ci-management
     branch: master