From 26a61a6523771bf602e032e7dc2e6f020e483668 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 23 Aug 2023 14:54:13 -0400 Subject: [PATCH 1/5] Remove emacs from debian SID This was added as a developer-friendly package, but as of this commit there are dependency problems in SID. Remove it, if it's really still needed somebody can add it back. Signed-off-by: Chris Evich --- cache_images/debian_packaging.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cache_images/debian_packaging.sh b/cache_images/debian_packaging.sh index 8a0a7aa7..63f7fdd7 100644 --- a/cache_images/debian_packaging.sh +++ b/cache_images/debian_packaging.sh @@ -39,7 +39,6 @@ INSTALL_PACKAGES=(\ crun dnsmasq e2fslibs-dev - emacs-nox file fuse3 fuse-overlayfs From 0de4a8bf4ac40693b69e529bb28d9eba77c74db9 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 23 Aug 2023 13:47:02 -0400 Subject: [PATCH 2/5] Update automation-library Significantly, this version defines a `passthrough_envars()` function to replace the two duplicate definitions in podman and buildah CI. When incorporating the new images into those environments, the duplicates should be removed. Also included is an important updates to the build-push script that improves debugging in cases where the `--nopush` argument is used. Signed-off-by: Chris Evich --- lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib.sh b/lib.sh index d999a624..37444e5d 100644 --- a/lib.sh +++ b/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}" From dd2f6bda56bc3ec955d2e6de4d5e978158319118 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 20 Sep 2023 14:07:21 -0400 Subject: [PATCH 3/5] Increase cache-image build timeout On several occasions this job has hit the 45m wall due (probably) to networking slowness (somewhere) downloading packages. Bunp it up to use the default 60m timeout. Signed-off-by: Chris Evich --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index c5286535..f2ecd998 100644 --- a/.cirrus.yml +++ b/.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 From a2f2f472a4a98015e382507efc1a961d2696886f Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 20 Sep 2023 15:52:45 -0400 Subject: [PATCH 4/5] Drop ZFS CI Support in Debian SID Maintaining this is a PITA and it seems to break very frequently with errors similar to: ``` Failed to process /etc/kernel/header_postinst.d at /var/lib/dpkg/info/linux-headers-6.5.0-1-cloud-amd64.postinst line 11. dpkg: error processing package linux-headers-6.5.0-1-cloud-amd64 (--configure): installed linux-headers-6.5.0-1-cloud-amd64 package post-installation script subprocess returned error exit status 1 dpkg: dependency problems prevent configuration of linux-headers-cloud-amd64: linux-headers-cloud-amd64 depends on linux-headers-6.5.0-1-cloud-amd64 (= 6.5.3-1); however: Package linux-headers-6.5.0-1-cloud-amd64 is not configured yet. dpkg: error processing package linux-headers-cloud-amd64 (--configure): dependency problems - leaving unconfigured dpkg: dependency problems prevent configuration of linux-headers-amd64: linux-headers-amd64 depends on linux-headers-6.5.0-1-amd64 (= 6.5.3-1); however: Package linux-headers-6.5.0-1-amd64 is not configured yet. dpkg: error processing package linux-headers-amd64 (--configure): dependency problems - leaving unconfigured dpkg: dependency problems prevent configuration of zfs-zed: zfs-zed depends on zfs-modules | zfs-dkms; however: Package zfs-modules is not installed. Package zfs-dkms which provides zfs-modules is not configured yet. Package zfs-dkms is not configured yet. dpkg: error processing package zfs-zed (--configure): dependency problems - leaving unconfigured ``` The fact is ZFS is completely unsupported by those whom pay our bills, a best-effort package in Debian, and an almost constant headache. It's only needed by the containers/storage CI, and nowhere else. It's not fair for CI in all the other repos to wait due to Debian+ZFS build problems. This commit removes ZFS support on all Debian images. Signed-off-by: Chris Evich --- cache_images/debian_packaging.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cache_images/debian_packaging.sh b/cache_images/debian_packaging.sh index 63f7fdd7..15406b60 100644 --- a/cache_images/debian_packaging.sh +++ b/cache_images/debian_packaging.sh @@ -120,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 From 13f4ad1ca35d4b60b13c041a0a6e1d5caac0a4dd Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 19 Sep 2023 11:23:17 -0400 Subject: [PATCH 5/5] Workarond failure to update SID kernel Without this, during package setup this error is emitted: ``` Setting up linux-image-6.5.0-1-cloud-amd64 (6.5.3-1) ... /etc/kernel/postinst.d/initramfs-tools: update-initramfs: Generating /boot/initrd.img-6.5.0-1-cloud-amd64 /etc/kernel/postinst.d/zz-update-grub: Generating grub configuration file ... /etc/grub.d/10_linux: 1: version_find_latest: not found run-parts: /etc/kernel/postinst.d/zz-update-grub exited with return code 127 dpkg: error processing package linux-image-6.5.0-1-cloud-amd64 (--configure): ``` Signed-off-by: Chris Evich --- IMG_SFX | 2 +- base_images/debian_base-setup.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IMG_SFX b/IMG_SFX index f9cca9ec..daee30e4 100644 --- a/IMG_SFX +++ b/IMG_SFX @@ -1 +1 @@ -20230919t202523z-f38f37d13 +20230920t195830z-f38f37d13 diff --git a/base_images/debian_base-setup.sh b/base_images/debian_base-setup.sh index 0cf0382d..15a7c159 100644 --- a/base_images/debian_base-setup.sh +++ b/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."