X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-rtd-rtd-verify-master;h=8b1c6ff29c6e8e85770cad1f38229c9431c1ba9a;hb=09f1cdabaef4703d7e326b76676e88212ccabd1f;hp=a9c3edb088273853d1a32b76ddcd94d380fb35e4;hpb=1c6c45e731e8941f3ff7894641ca7aee77a80426;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master
index a9c3edb0..8b1c6ff2 100644
--- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master
+++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master
@@ -191,6 +191,7 @@ fi
 git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
 
 echo "---> Generating docs"
+cd "$WORKSPACE"
 tox -edocs
 
 echo "---> Archiving generated docs"
@@ -278,7 +279,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 \
@@ -288,7 +289,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>
@@ -404,7 +405,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;