X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-gerrit-branch-lock-master;h=f998ddd4a5958f3b72f9646e42841915962f5e6c;hb=57a3ed0fccc08fec86d88935bb2f473ab74c305e;hp=40ae66ad9bb6e2991cc2c752588234e4b8e5cb66;hpb=4fe23ea9d77e245a36a6d57fc4b271dfe1cf3dd7;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master index 40ae66ad..f998ddd4 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master +++ b/.jjb-test/expected-xml/gerrit-ciman-gerrit-branch-lock-master @@ -315,7 +315,7 @@ echo "---> create-netrc.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}" +NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}" CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \ -t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \ -v x:username -o ":" -v x:password \ @@ -441,7 +441,7 @@ then echo "WARNING: Logging server not set" else - NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}" + NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}" NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}" BUILD_URL="${BUILD_URL}"