From 71c1d44b9cef8576a4e1a821dfacb8f6546f505d Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Wed, 8 Jan 2020 14:59:17 -0600 Subject: Fix Jenkins cloud config Fixing the Jenkins cloud config to use the correct hardware_id and credentials and adding the GIT_BASE config to global vars Change-Id: I8ff1418f01d6754bd77180a30e8cde6b8e7d92bf Signed-off-by: Vanessa Rene Valderrama --- jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg | 4 ++-- jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg | 2 +- jenkins-config/global-vars-production.sh | 1 + jenkins-config/global-vars-sandbox.sh | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'jenkins-config') diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 276125282..e8d47dd67 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -1,5 +1,5 @@ # Cloud Configuration -CLOUD_CREDENTIAL_ID=vexci +CLOUD_CREDENTIAL_ID=fdiovex-ci CLOUD_URL=https://auth.vexxhost.net/v3/ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 @@ -7,7 +7,7 @@ OS_CLOUD=vexci # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191215-024720.020 -HARDWARE_ID=v2-standard-1 +HARDWARE_ID=v2-highcpu-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/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg index e78a9880f..a21118e45 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg @@ -1,5 +1,5 @@ # Cloud Configuration -CLOUD_CREDENTIAL_ID=vex +CLOUD_CREDENTIAL_ID=vexx-fdio CLOUD_URL=https://auth.vexxhost.net/v3/ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index d880bcfb7..460475001 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -1,5 +1,6 @@ DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/ GERRIT_URL=git://10.30.48.3/mirror/$PROJECT +GIT_BASE=git://10.30.48.3/mirror/$PROJECT GIT_URL=git://10.30.48.3/mirror JENKINS_HOSTNAME=vex-yul-rot-jenkins-1 LOGS_SERVER=https://logs.fd.io diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index d52ebe9fa..05c4418ba 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -1,5 +1,6 @@ DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/ GERRIT_URL=git://10.30.48.3/mirror/$PROJECT +GIT_BASE=git://10.30.48.3/mirror/$PROJECT GIT_URL=git://10.30.48.3/mirror JENKINS_HOSTNAME=vex-yul-rot-jenkins-2 LOGS_SERVER=https://logs.fd.io -- cgit 1.2.3-korg