Remove unattended-upgrades from our Jenkins build images, they interfere

with job startup when we want to install something via apt.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/jenkins/packer-images/README b/jenkins/packer-images/README
index cbd71b4c0b465bbbcb5b292ece077baa8f800f30..70dcc2bd3a39574531eef0bb8f726e00233e7ae8 100644 (file)
--- a/jenkins/packer-images/README
+++ b/jenkins/packer-images/README
@@ -6,15 +6,15 @@ The files under this directory are used to create images used in our Jenkins CI.
 
 *** IMAGE FOR RUNNING TESTS ***
 
-packer build jenkins-image-tests.json
+packer build jenkins-image-arvados-tests.json
 
 *** IMAGE FOR RUNNING FEDERATION TESTS ***
 
 packer build jenkins-image-federation-tests.json
 
-*** IMAGE FOR BUILDING PACKAGES ***
+*** IMAGE FOR BUILDING PACKAGES AND DIAGNOSTICS ***
 
-packer build jenkins-image-build-packages.json
+packer build jenkins-image-with-docker.json
 
 *** IMAGE FOR K8S TESTS ***
 

diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index 460e22ca9299a2ebb0e84eddb47eee71cdfa7106..b06512da885db377836e1a7807e640daa3e4bdeb 100755 (executable)
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -15,6 +15,9 @@ echo "deb http://deb.debian.org/debian buster-backports main" | sudo tee /etc/ap
 # Install a few dependency packages
 sudo su -c "apt-get update"
 sudo su -c "DEBIAN_FRONTEND=noninteractive apt install -y git netcat default-jdk"
+# Remove unattended-upgrades so that it doesn't interfere with our nodes at startup
+sudo su -c "DEBIAN_FRONTEND=noninteractive apt-get remove -y unattended-upgrades"
+sudo su -c "DEBIAN_FRONTEND=noninteractive apt-get autoremove -y"
 
 # create a reference repository (bare git repo)
 # jenkins will use this to speed up the checkout for each job