From: Peter Mikus Date: Wed, 8 Sep 2021 14:40:12 +0000 (+0000) Subject: Merge "Revert "Change prod & sandbox to public IPs for Ingress/Gerrit"" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a0a5e94da98b406f63c9e09c645ada14d5a6eec4;p=ci-management.git Merge "Revert "Change prod & sandbox to public IPs for Ingress/Gerrit"" --- a0a5e94da98b406f63c9e09c645ada14d5a6eec4 diff --cc jenkins-config/global-vars-production.sh index 5bdc7e0b4,69a551399..f0724f427 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@@ -1,11 -1,13 +1,11 @@@ DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/ - GERRIT_URL=git://162.253.54.31/mirror/$PROJECT - GIT_BASE=git://162.253.54.31/mirror/$PROJECT - GIT_URL=git://162.253.54.31/mirror + 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 -NEXUS_URL=https://nexus.fd.io -NEXUSPROXY=https://nexus.fd.io PACKAGECLOUDPROXY=https://packagecloud.io/fdio PCIO_CO=fdio -S3_BUCKET= +S3_BUCKET=fdio-logs-s3-cloudfront-index +CDN_URL=s3-logs.fd.io SIGUL_KEY=fdio-release-2018 SILO=production diff --cc jenkins-config/global-vars-sandbox.sh index 97fddb794,79f2eb4cb..6c2057c62 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@@ -1,11 -1,13 +1,11 @@@ DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/ - GERRIT_URL=git://162.253.54.31/mirror/$PROJECT - GIT_BASE=git://162.253.54.31/mirror/$PROJECT - GIT_URL=git://162.253.54.31/mirror + 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 -NEXUS_URL=https://nexus.fd.io -NEXUSPROXY=https://nexus.fd.io PACKAGECLOUDPROXY=https://packagecloud.io/fdio PCIO_CO=fdio -S3_BUCKET= +S3_BUCKET=fdio-logs-s3-cloudfront-index +CDN_URL=s3-logs.fd.io SIGUL_KEY=fdio-sandbox SILO=sandbox