From d1f16c029aef43542964bb3f992db59360377e6c Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Thu, 18 Mar 2021 15:41:37 -0500 Subject: Modify ci-management flavor Modifying the ci-mgmt flavor to use v2 while we figure out what the issue is with the v3 flavors. Noticed the merge job is using the wrong builder so I switched it to the 4c-4g builder. Signed-off-by: Vanessa Rene Valderrama Change-Id: I23c5e9ab21711d8545fdbcd12baeb1cfc55a3662 --- 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/cloud.cfg | 2 +- jjb/ci-management/ci-management-jobs.yaml | 2 +- 4 files changed, 4 insertions(+), 4 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 cf844cd28..b08b4fb38 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=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 0b62d1abc..26cf4d602 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=v3-standard-4 +HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 7b8aa5bf6..f0c8fad11 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=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 9776841c6..f33e6e918 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -7,7 +7,7 @@ - gerrit-jenkins-sandbox-cleanup - gerrit-jjb-deploy-job - gerrit-jjb-merge: - build-node: centos7-builder-8c-8g + build-node: centos7-builder-4c-4g - gerrit-jjb-verify project: ci-management -- cgit 1.2.3-korg