[ARVADOS-DEV] updated: 1109ad85d4a822e5a650ee1b3a38286d6d319a37

[Git user]

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

       via  1109ad85d4a822e5a650ee1b3a38286d6d319a37 (commit)
      from  16cf516bed2609efdd328ea89dd6630a6ee54062 (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 1109ad85d4a822e5a650ee1b3a38286d6d319a37
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Aug 18 15:04:57 2020 -0400

    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 at curii.com>

diff --git a/jenkins/packer-images/README b/jenkins/packer-images/README
index cbd71b4..70dcc2b 100644
--- 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 460e22c..b06512d 100755
--- 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

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


hooks/post-receive
--