X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-rtd-rtd-merge-master;h=89c99efb048f739a062b70c35235c4a644dcb725;hb=1eb8eec13a258711551c38c2555cb61af38578c9;hp=f9effc2c7f3f57da74a0d17c2524f723e23b21c5;hpb=4fe23ea9d77e245a36a6d57fc4b271dfe1cf3dd7;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master index f9effc2c..89c99efb 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-merge-master @@ -243,7 +243,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 \ @@ -369,7 +369,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}"