From 4392650a1c02f3d96a513c6107f284ba50f5b577 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 09:24:29 -0700 Subject: [PATCH 1/5] Fedora 41 is stable. Bump. Signed-off-by: Ed Santiago --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 48f510a1..819d1ed9 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,11 @@ export CENTOS_STREAM_RELEASE = 9 # Warning: Beta Fedora releases are not supported. Verifiy EC2 AMI availability # here: https://fedoraproject.org/cloud/download -export FEDORA_RELEASE = 40 -export PRIOR_FEDORA_RELEASE = 39 +export FEDORA_RELEASE = 41 +export PRIOR_FEDORA_RELEASE = 40 # This should always be one-greater than $FEDORA_RELEASE (assuming it's actually the latest) -export RAWHIDE_RELEASE = 41 +export RAWHIDE_RELEASE = 42 # Automation assumes the actual release number (after SID upgrade) # is always one-greater than the latest DEBIAN_BASE_FAMILY (GCE image). From 4a12d4e3bda87a8e89fb23a887f2299d7ec9fb7d Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 09:26:07 -0700 Subject: [PATCH 2/5] Fedora AWS query: strip the us-east-1 Something has changed in Fedora images on AWS. The us-east-1 suffix no longer exists. Remove it. Signed-off-by: Ed Santiago --- base_images/cloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_images/cloud.yml b/base_images/cloud.yml index 17439f3e..b842d830 100644 --- a/base_images/cloud.yml +++ b/base_images/cloud.yml @@ -118,7 +118,7 @@ builders: architecture: 'x86_64' image-type: 'machine' is-public: 'true' - name: 'Fedora-Cloud-Base*-{{user `FEDORA_RELEASE`}}-*us-east-1*' + name: 'Fedora-Cloud-Base*-{{user `FEDORA_RELEASE`}}-*' root-device-type: 'ebs' state: 'available' virtualization-type: 'hvm' From aef024bab74cdad710a85103b0deb17a6fe4768b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 09:30:06 -0700 Subject: [PATCH 3/5] Changes needed for new dnf Lots of things seem to have changed in dnf-land. These are the changes that get us working again. Signed-off-by: Ed Santiago --- cache_images/fedora-podman-py_packaging.sh | 2 +- cache_images/fedora_packaging.sh | 2 +- cache_images/rawhide_setup.sh | 15 +++------------ ci/Containerfile | 4 ++-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cache_images/fedora-podman-py_packaging.sh b/cache_images/fedora-podman-py_packaging.sh index 58c87d74..d2d085ec 100644 --- a/cache_images/fedora-podman-py_packaging.sh +++ b/cache_images/fedora-podman-py_packaging.sh @@ -17,7 +17,7 @@ source "$REPO_DIRPATH/lib.sh" # shellcheck disable=SC2154 warn "Enabling updates-testing repository for $PACKER_BUILD_NAME" lilto ooe.sh $SUDO dnf install -y 'dnf-command(config-manager)' -lilto ooe.sh $SUDO dnf config-manager --set-enabled updates-testing +lilto ooe.sh $SUDO dnf config-manager setopt updates-testing.enabled=1 msg "Updating/Installing repos and packages for $OS_REL_VER" diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh index eaa8e11d..c24aeefb 100644 --- a/cache_images/fedora_packaging.sh +++ b/cache_images/fedora_packaging.sh @@ -28,7 +28,7 @@ req_env_vars PACKER_BUILD_NAME if [[ "$PACKER_BUILD_NAME" == "fedora" ]] && [[ ! "$PACKER_BUILD_NAME" =~ "prior" ]]; then warn "Enabling updates-testing repository for $PACKER_BUILD_NAME" lilto ooe.sh $SUDO dnf install -y 'dnf-command(config-manager)' - lilto ooe.sh $SUDO dnf config-manager --set-enabled updates-testing + lilto ooe.sh $SUDO dnf config-manager setopt updates-testing.enabled=1 else warn "NOT enabling updates-testing repository for $PACKER_BUILD_NAME" fi diff --git a/cache_images/rawhide_setup.sh b/cache_images/rawhide_setup.sh index 693fc99b..fd5090d3 100644 --- a/cache_images/rawhide_setup.sh +++ b/cache_images/rawhide_setup.sh @@ -16,18 +16,9 @@ source "$REPO_DIRPATH/lib.sh" # for both VM and container image build workflows. req_env_vars PACKER_BUILD_NAME -# Going from F38 -> rawhide requires some special handling WRT DNF upgrade to DNF5 -if [[ "$OS_RELEASE_VER" -ge 38 ]]; then - warn "Upgrading dnf -> dnf5" - showrun $SUDO dnf update -y dnf - showrun $SUDO dnf install -y dnf5 - # Even dnf5 refuses to remove the 'dnf' package. - showrun $SUDO rpm -e yum dnf -else - warn "Upgrading Fedora '$OS_RELEASE_VER' to rawhide, this might break." - # shellcheck disable=SC2154 - warn "If so, this script may be found in the repo. as '$SCRIPT_DIRPATH/$SCRIPT_FILENAME'." -fi +warn "Upgrading Fedora '$OS_RELEASE_VER' to rawhide, this might break." +# shellcheck disable=SC2154 +warn "If so, this script may be found in the repo. as '$SCRIPT_DIRPATH/$SCRIPT_FILENAME'." # Show what's happening set -x diff --git a/ci/Containerfile b/ci/Containerfile index 21a3abb8..84f5cbdf 100644 --- a/ci/Containerfile +++ b/ci/Containerfile @@ -17,7 +17,7 @@ ENV CIRRUS_WORKING_DIR=/var/tmp/automation_images \ # to rely on COPY or ADD instructions. See documentation for warning. RUN test -n "$PACKER_VERSION" RUN dnf update -y && \ - dnf mark remove $(rpm -qa | grep -Ev '(gpg-pubkey)|(dnf)|(sudo)') && \ + dnf -y mark dependency $(rpm -qa | grep -Ev '(gpg-pubkey)|(dnf)|(sudo)') && \ dnf install -y \ ShellCheck \ bash-completion \ @@ -38,7 +38,7 @@ RUN dnf update -y && \ util-linux \ unzip \ && \ - dnf mark install dnf sudo $_ && \ + dnf -y mark user dnf sudo $_ && \ dnf autoremove -y && \ dnf clean all From 4839366e721e00e4efe31910bc76ae9849199e0a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 09:32:10 -0700 Subject: [PATCH 4/5] Installed packages: make them work again Changes necessary to get working VM images. I can't remember why all of these are necessary. I think the docker-compose change is because that package started bringing in too many unwanted dependencies that conflict with podman. Anyhow, this works. Signed-off-by: Ed Santiago --- cache_images/fedora_packaging.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh index c24aeefb..7e59ef45 100644 --- a/cache_images/fedora_packaging.sh +++ b/cache_images/fedora_packaging.sh @@ -112,6 +112,7 @@ INSTALL_PACKAGES=(\ passt perl-Clone perl-FindBin + pigz pkgconfig podman pre-commit @@ -145,12 +146,10 @@ INSTALL_PACKAGES=(\ # Rawhide images don't need these packages if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then INSTALL_PACKAGES+=( \ - docker-compose python-pip-wheel python-setuptools-wheel python-toml python-wheel-wheel - python2 python3-PyYAML python3-coverage python3-dateutil @@ -177,7 +176,9 @@ fi if ! ((CONTAINER)); then INSTALL_PACKAGES+=( \ bpftrace + composefs container-selinux + fuse-overlayfs libguestfs-tools selinux-policy-devel policycoreutils From 4b297585c35c03e43abad361a30a3ebe298976b6 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 09:35:17 -0700 Subject: [PATCH 5/5] bump IMG_SFX Signed-off-by: Ed Santiago --- IMG_SFX | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IMG_SFX b/IMG_SFX index e8963a1f..5a9b1133 100644 --- a/IMG_SFX +++ b/IMG_SFX @@ -1 +1 @@ -20241016t144444z-f40f39d13 +20241106t163000z-f41f40d13