X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-rtd-rtd-verify-master;h=700e4ebfb88979f9aa5146227f0af80e67c84cbc;hb=refs%2Fchanges%2F30%2F7030%2F1;hp=5e71f5d1f1fc808cd67e1fd8c9b35196459a2811;hpb=4fcbb75b221af652f8ced9724544ffc600afd33a;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index 5e71f5d1..700e4ebf 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -81,14 +81,14 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. origin - + $GERRIT_REFSPEC $GIT_URL/$PROJECT test-credential - refs/heads/master + refs/heads/$GERRIT_BRANCH @@ -163,7 +163,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. false - false + true false false @@ -327,7 +327,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 \ @@ -453,7 +453,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}"