Moves packer installation to the common script. No issue #

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index e68b092c0779fd178f3c757787f52ab09cc8f28e..47ff56d814d5fff9e4ffd9609279561910496c20 100755 (executable)
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -48,6 +48,12 @@ sudo chown jenkins:jenkins arvados.git -R
 # Jenkins will use this script to determine when the node is ready for use
 sudo mv /tmp/node-ready.sh /usr/local/bin/
 
+# Packer install
+cd /tmp
+wget https://releases.hashicorp.com/packer/1.8.0/packer_1.8.0_linux_amd64.zip
+unzip packer_1.8.0_linux_amd64.zip packer
+sudo mv packer /usr/local/bin/
+
 # make sure sshd does not start on boot (yes, this is nasty). Jenkins will call
 # /tmp/node-ready.sh as a GCP `startup script`, which gets run on node start.
 # That script loops until it can connect to git.arvados.org, and then starts

diff --git a/jenkins/packer-images/jenkins-image-with-docker.sh b/jenkins/packer-images/jenkins-image-with-docker.sh
index cd0e47715b4bdf32475063b24bd65d097c83e61f..3f5bec7b43f750463216fe7a7a1dcc56b47f16ef 100755 (executable)
--- a/jenkins/packer-images/jenkins-image-with-docker.sh
+++ b/jenkins/packer-images/jenkins-image-with-docker.sh
@@ -10,12 +10,6 @@ set -eo pipefail
 sudo su -c "DEBIAN_FRONTEND=noninteractive apt-get install -y docker.io make wget dpkg-dev createrepo-c unzip"
 sudo usermod -a -G docker jenkins
 
-#Packer install
-cd /tmp
-wget https://releases.hashicorp.com/packer/1.8.0/packer_1.8.0_linux_amd64.zip
-unzip packer_1.8.0_linux_amd64.zip packer
-sudo mv packer /usr/local/bin/
-
 # Install the arvados-dev repo where the Jenkins job expects it
 cd /usr/local
 sudo git clone --depth 1 https://github.com/arvados/arvados-dev