X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-merge-ubuntu1604-java-builder;h=f7f6b575bd41a57cf07312c8726091cb4e5dd1ad;hb=refs%2Fchanges%2F88%2F6988%2F1;hp=7cf25b588f16d26218c4c6769add44ecc228425a;hpb=0ea33652f2dbed50a617fc62a80d1df9d56fb3ae;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index 7cf25b58..f7f6b575 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@ -76,7 +76,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
         <hudson.model.StringParameterDefinition>
           <name>PACKER_VERSION</name>
           <description>Packer version to download and install.</description>
-          <defaultValue>1.0.2</defaultValue>
+          <defaultValue>1.1.1</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -205,7 +205,7 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
     </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
     <EnvInjectBuilder>
       <info>
-        <propertiesContent>PACKER_VERSION=1.0.2
+        <propertiesContent>PACKER_VERSION=1.1.1
 </propertiesContent>
       </info>
     </EnvInjectBuilder>
@@ -230,16 +230,14 @@ PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
-# Default packer binary made available on the build image
-packer_bin=&quot;/usr/local/bin/packer.io&quot;
 
-if hash &quot;$packer_bin&quot; 2&gt;/dev/null; then
+if hash packer.io 2&gt;/dev/null; then
     echo &quot;packer.io command is available.&quot;
 else
     echo &quot;packer.io command not is available. Installing packer ...&quot;
     # Installs Hashicorp's Packer binary, required for verify &amp; merge packer jobs
     pushd packer
-    wget &quot;https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip&quot;
+    wget -nv &quot;https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip&quot;
     mkdir -p &quot;${WORKSPACE}/bin&quot;
     unzip &quot;packer_${PACKER_VERSION}_linux_amd64.zip&quot; -d ${WORKSPACE}/bin/
     # rename packer to avoid conflict with binary in cracklib
@@ -317,7 +315,7 @@ exit 0
       <info>
         <propertiesContent>PACKER_PLATFORM=ubuntu1604
 PACKER_TEMPLATE=java-builder
-PACKER_VERSION=1.0.2
+PACKER_VERSION=1.1.1
 </propertiesContent>
       </info>
     </EnvInjectBuilder>
@@ -342,16 +340,14 @@ PACKER_VERSION=&quot;${PACKER_VERSION:-1.0.2}&quot;
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
-# Default packer binary made available on the build image
-packer_bin=&quot;/usr/local/bin/packer.io&quot;
 
-if hash &quot;$packer_bin&quot; 2&gt;/dev/null; then
+if hash packer.io 2&gt;/dev/null; then
     echo &quot;packer.io command is available.&quot;
 else
     echo &quot;packer.io command not is available. Installing packer ...&quot;
     # Installs Hashicorp's Packer binary, required for verify &amp; merge packer jobs
     pushd packer
-    wget &quot;https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip&quot;
+    wget -nv &quot;https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip&quot;
     mkdir -p &quot;${WORKSPACE}/bin&quot;
     unzip &quot;packer_${PACKER_VERSION}_linux_amd64.zip&quot; -d ${WORKSPACE}/bin/
     # rename packer to avoid conflict with binary in cracklib