X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-merge-ubuntu1604-mininet;h=9bd47dafe479c4801fbe4c9359669afb48a91f6f;hb=441d8bb3f89af4508101bc555887bd0b81e2f078;hp=73c50d51fe155c205e74e8372bf1ca4a97225611;hpb=0ee567bb454432e6e4ca1bc6f45431b68e95bad3;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index 73c50d51..9bd47daf 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@ -230,16 +230,14 @@ PACKER_VERSION="${PACKER_VERSION:-1.0.2}"
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
-# Default packer binary made available on the build image
-packer_bin="/usr/local/bin/packer.io"
 
-if hash "$packer_bin" 2>/dev/null; then
+if hash packer.io 2>/dev/null; then
     echo "packer.io command is available."
 else
     echo "packer.io command not is available. Installing packer ..."
     # Installs Hashicorp's Packer binary, required for verify & merge packer jobs
     pushd packer
-    wget "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
+    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/
     # rename packer to avoid conflict with binary in cracklib
@@ -342,16 +340,14 @@ PACKER_VERSION="${PACKER_VERSION:-1.0.2}"
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
-# Default packer binary made available on the build image
-packer_bin="/usr/local/bin/packer.io"
 
-if hash "$packer_bin" 2>/dev/null; then
+if hash packer.io 2>/dev/null; then
     echo "packer.io command is available."
 else
     echo "packer.io command not is available. Installing packer ..."
     # Installs Hashicorp's Packer binary, required for verify & merge packer jobs
     pushd packer
-    wget "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
+    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/
     # rename packer to avoid conflict with binary in cracklib