X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-clm-master;h=afecea1e4df5772ec223539e15371a6136d36194;hb=fc75b20f7ec19cb7cfdbd74385bf1262ccb7a84c;hp=cc9a71ba5f985a2dd9269a6560988f62edd3a187;hpb=4fe23ea9d77e245a36a6d57fc4b271dfe1cf3dd7;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
index cc9a71ba..afecea1e 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@ -74,6 +74,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
@@ -344,7 +349,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 \
@@ -470,7 +475,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}"