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=e102182affd4dd32d8c86cdf2bdde41c1907caff;hpb=104b6bedf338b017ad2b794bb886a235a9372185;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 e102182a..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
@@ -239,6 +239,7 @@ fi
git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
echo "---> Generating docs"
+cd "$WORKSPACE"
tox -edocs
echo "---> Archiving generated docs"
@@ -326,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 \
@@ -452,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}"