X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-python-tox-verify-master;h=1a6f8264637dfe17b2f1e9e37417dcbf440b0059;hb=refs%2Fchanges%2F30%2F7030%2F1;hp=c26634210d9c39d7e126e88f7fe3e45f9d83ab5a;hpb=74befe2e7c32b79d51891deb3d5e06a3ac446b42;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index c2663421..1a6f8264 100644
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -292,6 +292,10 @@ run_tox() {
     local log_dir="$1"
     local env="$2"
 
+    # Sleep a random 10 second interval to workaround tox sdist
+    # conflicts due to building in the same dist directory.
+    sleep $[ ( $RANDOM % 10 )  + 1 ]s
+
     echo "-----> Running tox $env"
     if ! tox -e $env > "$log_dir/tox-$env.log"; then
         echo "$env" >> "$log_dir/failed-envs.log"
@@ -397,7 +401,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 \
@@ -523,7 +527,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}"