X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-centos-java-builder;h=86f2f16f460bb9a30b0f093e37c3fa7e20a05d10;hb=7b93f6b4bae8c996e38dbab01a1a129b8dbfd47d;hp=df8f3cc6ac399f9e91bec1ddf284dc5b23bcd5f6;hpb=7ce2809af0e22181a0e399311f879f34f2392e32;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index df8f3cc6..86f2f16f 100644
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@ -9,8 +9,9 @@
build-vm
false
-
+
https://github.com/example-org/releng/ciman
+
@@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
refs/heads/master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
tykeal
zxiiro
example-org
+
+
^remerge$
+
true
true
false
@@ -194,12 +192,12 @@ if hash packer.io 2>/dev/null; then
else
echo "packer.io command not is available. Installing packer ..."
# Installs Hashicorp's Packer binary, required for verify & merge packer jobs
- pushd packer
+ pushd "${WORKSPACE}"
wget -nv "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
mkdir -p "${WORKSPACE}/bin"
- unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d ${WORKSPACE}/bin/
+ unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d "${WORKSPACE}/bin/"
# rename packer to avoid conflict with binary in cracklib
- mv ${WORKSPACE}/bin/packer "${WORKSPACE}/bin/packer.io"
+ mv "${WORKSPACE}/bin/packer" "${WORKSPACE}/bin/packer.io"
popd
fi
@@ -231,8 +229,9 @@ templates=(templates/*.json)
for varfile in "${varfiles[@]}"; do
# cloud-env.json is a file containing credentials which is pulled in via
- # CLOUDENV variable so skip it here.
- if [[ "$varfile" == *"cloud-env.json"* ]]; then
+ # CLOUDENV variable so skip it here. Also handle the case where a project
+ # has not vars/*.json file.
+ if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then
continue
fi
@@ -312,12 +311,12 @@ if hash packer.io 2>/dev/null; then
else
echo "packer.io command not is available. Installing packer ..."
# Installs Hashicorp's Packer binary, required for verify & merge packer jobs
- pushd packer
+ pushd "${WORKSPACE}"
wget -nv "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
mkdir -p "${WORKSPACE}/bin"
- unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d ${WORKSPACE}/bin/
+ unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d "${WORKSPACE}/bin/"
# rename packer to avoid conflict with binary in cracklib
- mv ${WORKSPACE}/bin/packer "${WORKSPACE}/bin/packer.io"
+ mv "${WORKSPACE}/bin/packer" "${WORKSPACE}/bin/packer.io"
popd
fi
@@ -651,7 +650,7 @@ rm ~/.netrc
- 45
+ 90
BUILD_TIMEOUT
true
false