X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-javadoc-verify-master;h=63b64e2deffe379efd339f0484da40710f5690d3;hb=410c98d801fccf6fb097603dc39b31f47165660c;hp=3268c2e53afaa00e3717e9639c302e010aed7e11;hpb=4fe23ea9d77e245a36a6d57fc4b271dfe1cf3dd7;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master index 3268c2e5..63b64e2d 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master @@ -6,7 +6,7 @@ false false false - false + true build-vm false @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m @@ -339,7 +344,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 \ @@ -465,7 +470,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}"