Revert "Global: Disable Nexus for fdio-infra-ship-logs in production"

This reverts commit 94ccf388b6317892bdd5db5c7b8a2baedaf904c4.

Reason for revert: CORS setting of S3 is corrupted. Until LF ticket is
resolved reverting.

Change-Id: I59e6196f8e3317f249aa4258435705cc8965a80c
Signed-off-by: pmikus <[email protected]>

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 5bdc7e0..58fdfc3 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -3,6 +3,9 @@ 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
 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=fdio-logs-s3-cloudfront-index

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 8e582fb..eed5c0b 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -762,7 +762,7 @@
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
       - description-setter:
-          regexp: "(^S3 build logs: .*)"
+          regexp: "(^Nexus build logs: .*)"
 
 - builder:
     name: packer-validate