summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2021-08-06 09:48:29 +0000
committerPeter Mikus <pmikus@cisco.com>2021-08-06 09:48:29 +0000
commit857c3b81cc359b14dea33cf0a37790de7180b5b2 (patch)
treeca588ee2b08230f7a2cd57dcff4540c947ae2dba
parent94ccf388b6317892bdd5db5c7b8a2baedaf904c4 (diff)
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 <pmikus@cisco.com>
-rw-r--r--jenkins-config/global-vars-production.sh3
-rw-r--r--jjb/global-macros.yaml2
2 files changed, 4 insertions, 1 deletions
diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 5bdc7e0b..58fdfc33 100644
--- 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 8e582fb0..eed5c0be 100644
--- 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