Merge pull request containers#298 from cevich/update_automation_lib

Update automation-library

.cirrus.yml

@@ -213,7 +213,6 @@ cache_images_task:
     # Packer needs time to clean up partially created VM images
     auto_cancellation: $CI != "true"
     stateful: true
-    timeout_in: 45m
     container:
         dockerfile: "image_builder/Containerfile"
         cpu: 2

IMG_SFX

@@ -1 +1 @@
-20230919t202523z-f38f37d13
+20230920t195830z-f38f37d13

base_images/debian_base-setup.sh

@@ -37,6 +37,12 @@ PKGS=( \
 
 echo "Updating package source lists"
 ( set -x; $SUDO apt-get -qq -y update; )
+
+# TODO: Workaround forward-incompatible change in grub scripts.
+# Without this, updating to the SID kernel may fail.
+echo "Upgrading to SID's grub-common"
+( set -x; $SUDO apt-get -qq -y upgrade grub-common; )
+
 echo "Upgrading to SID"
 ( set -x; $SUDO apt-get -qq -y full-upgrade; )
 echo "Installing basic, necessary packages."

cache_images/debian_packaging.sh

@@ -39,7 +39,6 @@ INSTALL_PACKAGES=(\
     crun
     dnsmasq
     e2fslibs-dev
-    emacs-nox
     file
     fuse3
     fuse-overlayfs
@@ -121,15 +120,6 @@ INSTALL_PACKAGES=(\
 msg "Installing general build/testing dependencies"
 bigto $SUDO apt-get -q -y install "${INSTALL_PACKAGES[@]}"
 
-msg "Enabling contrib source & installing ZFS support (for containers/storage CI)"
-ZFS_PACKAGES=(\
-    linux-headers-cloud-amd64
-    zfsutils
-)
-$SUDO sed -i -r 's/^(deb.*)/\1 contrib/g' /etc/apt/sources.list
-lilto ooe.sh $SUDO apt-get -qq -y update
-bigto $SUDO apt-get -q -y install "${ZFS_PACKAGES[@]}"
-
 # The nc installed by default is missing many required options
 $SUDO update-alternatives --set nc /usr/bin/ncat
 

lib.sh

@@ -19,7 +19,7 @@ OS_REL_VER="$OS_RELEASE_ID-$OS_RELEASE_VER"
 # This location is checked by automation in other repos, please do not change.
 PACKAGE_DOWNLOAD_DIR=/var/cache/download
 
-INSTALL_AUTOMATION_VERSION="4.2.1"
+INSTALL_AUTOMATION_VERSION="4.3.1"
 
 PUSH_LATEST="${PUSH_LATEST:-0}"