X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-merge-centos-java-builder;h=9a20567f11ff96a786b1c8c6211a89e5b22f6daa;hb=refs%2Fchanges%2F46%2F7246%2F1;hp=132f7c47b6a044e5856ba7dd5908555c96ad4690;hpb=6b7ea0316fdc6f6e3b3e6f443c723d0818b34c61;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index 132f7c47..9a20567f 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
@@ -76,7 +76,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
PACKER_VERSION
Packer version to download and install.
- 1.0.2
+ 1.1.1
@@ -205,7 +205,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- PACKER_VERSION=1.0.2
+ PACKER_VERSION=1.1.1
@@ -315,7 +315,7 @@ exit 0
PACKER_PLATFORM=centos
PACKER_TEMPLATE=java-builder
-PACKER_VERSION=1.0.2
+PACKER_VERSION=1.1.1
@@ -494,7 +494,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 \
@@ -504,7 +504,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
@@ -620,7 +620,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}"