summaryrefslogtreecommitdiffstats
path: root/jenkins-config
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2020-01-08 14:59:17 -0600
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2020-01-08 18:03:07 -0600
commit71c1d44b9cef8576a4e1a821dfacb8f6546f505d (patch)
treed50a35f1af156ac6aa6a676ef5d3baecf22a22ed /jenkins-config
parentbee0c82b5efafe81c5c3bf5abf71b7a8ef7f2e3c (diff)
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 <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jenkins-config')
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg4
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX/cloud.cfg2
-rw-r--r--jenkins-config/global-vars-production.sh1
-rw-r--r--jenkins-config/global-vars-sandbox.sh1
4 files changed, 5 insertions, 3 deletions
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index 27612528..e8d47dd6 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 e78a9880..a21118e4 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 d880bcfb..46047500 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 d52ebe9f..05c4418b 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