X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-verify;h=9ae4fa2cb08243ec777b7809d6b6facca7c28e1c;hb=refs%2Fchanges%2F29%2F7529%2F1;hp=89cec33ffb8cd343185e433a6dfbce908defa76a;hpb=441d8bb3f89af4508101bc555887bd0b81e2f078;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-verify b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
index 89cec33f..9ae4fa2c 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
@@ -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
@@ -140,15 +140,15 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
ANT
- packer/vars/['centos', 'ubuntu1604'].json
+ packer/vars/**.json
ANT
- packer/templates/['java-builder', 'mininet'].json
+ packer/templates/**.json
ANT
- packer/provision/['java-builder', 'mininet'].sh
+ packer/provision/**.sh
ANT
@@ -176,7 +176,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
- false
+ true
false
false
@@ -207,7 +207,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- PACKER_VERSION=1.0.2
+ PACKER_VERSION=1.1.1
@@ -384,7 +384,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 \
@@ -394,7 +394,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
@@ -510,7 +510,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}"
@@ -582,5 +582,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+