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=cda2ec16956502d39e9cffb1843987c03aca8c00;hp=1ca7ec2f5dcb1d3d353e5431126596a6919a8b1a;hpb=92a481651941f5e235ce7205ebed1a7d0c6501f8;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 1ca7ec2f..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 \
@@ -325,7 +325,7 @@ machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
 user=$(echo "$CREDENTIAL" | cut -f1 -d:)
 pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
 
-echo "machine $machine login $user password $pass" > ~/.netrc
+echo "machine ${machine%:*} login $user password $pass" > ~/.netrc
 </command>
         </hudson.tasks.Shell>
         <hudson.tasks.Shell>
@@ -441,7 +441,7 @@ then
 
     echo &quot;WARNING: Logging server not set&quot;
 else
-    NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+    NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
     NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
     BUILD_URL=&quot;${BUILD_URL}&quot;