[arvados-dev] updated: 847a86c63143828e7dcb6a94802eb3ab15f40daf

[git repository hosting]

Summary of changes:
 jenkins/packer-images/jenkins-image-common.sh      | 6 ------
 jenkins/packer-images/jenkins-image-with-docker.sh | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  847a86c63143828e7dcb6a94802eb3ab15f40daf (commit)
      from  6bb96787fceb1a98c0f3bd0d15437f2ace107140 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 847a86c63143828e7dcb6a94802eb3ab15f40daf
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Jan 12 12:51:00 2024 -0300

    Reverts previous change as it wasn't needed. No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index 47ff56d..e68b092 100755
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -48,12 +48,6 @@ 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 3f5bec7..cb27956 100755
--- a/jenkins/packer-images/jenkins-image-with-docker.sh
+++ b/jenkins/packer-images/jenkins-image-with-docker.sh
@@ -10,6 +10,12 @@ 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

-----------------------------------------------------------------------


hooks/post-receive
--