Reverts previous change as it wasn't needed. No issue #

[arvados-dev.git] / jenkins / packer-images / jenkins-image-common.sh

diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index 62de53ee2ab11f32f073249f58397d42d76ba43e..e68b092c0779fd178f3c757787f52ab09cc8f28e 100755 (executable)
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -12,7 +12,7 @@ sudo su -c "echo ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDH8swFWEfEfHhA+C5ezV8SXO/
 
 # Install a few dependency packages
 # First, let's figure out the OS we're working on
-OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d \")
+OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d \" | cut -f 2 -d = )
 echo "Detected distro: ${OS_ID}"
 
 case ${OS_ID} in
@@ -23,11 +23,12 @@ case ${OS_ID} in
     PKGS="git nmap-ncat java-11-openjdk"
     ;;
   debian|ubuntu)
-    echo "deb http://deb.debian.org/debian buster-backports main" | sudo tee /etc/apt/sources.list.d/buster-backports.list
-
-    PREINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt update"
-    INSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt install -y"
-    POSTINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt autopurge -y"
+    if [ ${OS_ID} = "debian" ]; then
+      echo "deb http://deb.debian.org/debian buster-backports main" | sudo tee /etc/apt/sources.list.d/buster-backports.list
+    fi
+    PREINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt-get update"
+    INSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt-get install -y"
+    POSTINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt-get purge --autoremove -y"
     # SUFFIX packages with - to remove them
     # Remove unattended-upgrades so that it doesn't interfere with our nodes at startup
     PKGS="git netcat-traditional default-jdk unattended-upgrades-"
@@ -41,7 +42,7 @@ sudo su -c "${POSTINSTALL_CMD}"
 # create a reference repository (bare git repo)
 # jenkins will use this to speed up the checkout for each job
 cd /usr/src
-sudo git clone --mirror https://git.arvados.org/arvados.git
+sudo git clone --mirror git://git.arvados.org/arvados.git
 sudo chown jenkins:jenkins arvados.git -R
 
 # Jenkins will use this script to determine when the node is ready for use