aboutsummaryrefslogtreecommitdiffstats
path: root/packer
diff options
context:
space:
mode:
authorAnil Belur <abelur@linuxfoundation.org>2017-06-15 11:13:50 +1000
committerAnil Belur <abelur@linuxfoundation.org>2017-06-15 11:13:50 +1000
commit6ef9e145b46df242ecd3f82dea238de44a62a4c9 (patch)
tree3a7587406384ce6f1912aedcb10270bce14cd610 /packer
parenta071b7895b5eaf1967a26a43c0d61746576edbf1 (diff)
Add hashicorp's packer 1.0.0
The previous change: 9515, does not pull in the packer binaries into basebuild, so moving this to baseline is more appropriate. Change-Id: I149e83635cce5e9ce62d06fccb4d30099ecd3906 Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Diffstat (limited to 'packer')
-rw-r--r--packer/provision/basebuild.sh9
-rw-r--r--packer/provision/baseline.sh9
2 files changed, 9 insertions, 9 deletions
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 50539eda..08651d16 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -11,12 +11,3 @@ cat <<EOFSTAB >> /etc/fstab
none /tmp tmpfs defaults 0 0
EOFSTAB
-
-# The following installs hashicorp's packer binary which is required for
-# ci-management-{verify,merge}-packer jobs
-mkdir /tmp/packer
-cd /tmp/packer
-wget https://releases.hashicorp.com/packer/1.0.0/packer_1.0.0_linux_amd64.zip
-unzip packer_1.0.0_linux_amd64.zip -d /usr/local/bin/
-# rename packer to avoid conflict with binary in cracklib
-mv /usr/local/bin/packer /usr/local/bin/packer.io
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index adf23afd..66bd6bbc 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -137,6 +137,15 @@ Defaults:jenkins !requiretty
jenkins ALL = NOPASSWD: /usr/bin/update-alternatives
EOF
+ # The following installs hashicorp's packer binary which is required for
+ # ci-management-{verify,merge}-packer jobs
+ mkdir /tmp/packer
+ cd /tmp/packer
+ wget https://releases.hashicorp.com/packer/1.0.0/packer_1.0.0_linux_amd64.zip
+ unzip packer_1.0.0_linux_amd64.zip -d /usr/local/bin/
+ # rename packer to avoid conflict with binary in cracklib
+ mv /usr/local/bin/packer /usr/local/bin/packer.io
+
# Do any Distro specific installations here
echo "Checking distribution"
FACTER_OS=$(/usr/bin/facter operatingsystem)