Merge pull request #392 from edsantiago/f41-clean

VMs: bump to f41

IMG_SFX

@@ -1 +1 @@
-20241016t144444z-f40f39d13
+20241106t163000z-f41f40d13

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).

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'

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"
 

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
@@ -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

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

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