Merge pull request #325 from edsantiago/no_more_cni

New VMs: include netavark in prior-fedora

IMG_SFX

@@ -1 +1 @@
-20240125t184057z-f39f38d13
+20240201t143038z-f39f38d13

base_images/debian_base-setup.sh

@@ -53,7 +53,7 @@ echo "Updating package source lists"
 # FIXME: 2024-01-02: Bumped the timebomb expiration date because it's
 #        too hard to find out if it's fixed or not
 #        2024-01-25: again
-timebomb 20240131 "workaround for updating debian 12 to 13"
+timebomb 20240222 "workaround for updating debian 12 to 13"
 $SUDO tee /usr/bin/version_find_latest <<"EOF"
 #!/bin/bash
 #
@@ -142,7 +142,7 @@ $SUDO chmod 755 /usr/bin/version_find_latest
 #     https://github.com/containers/podman/issues/19407
 #     https://bugzilla.redhat.com/show_bug.cgi?id=2230127
 # 2024-01-25 dfsg-3 also has the bug
-timebomb 20240131 "prevent us from getting broken tar-1.35+dfsg-3"
+timebomb 20240222 "prevent us from getting broken tar-1.35+dfsg-3"
 ( set -x; $SUDO apt-mark hold tar; )
 
 echo "Upgrading to SID"

cache_images/fedora_packaging.sh

@@ -140,13 +140,7 @@ INSTALL_PACKAGES=(\
     zstd
 )
 
-# Test with CNI in Fedora N-1
-EXARG=""
-if [[ "$PACKER_BUILD_NAME" =~ prior ]]; then
-    EXARG="--exclude=netavark --exclude=aardvark-dns"
-fi
-
-# Rawhide images don't need these pacakges
+# Rawhide images don't need these packages
 if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then
     INSTALL_PACKAGES+=( \
         docker-compose
@@ -173,13 +167,6 @@ if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then
     )
 fi
 
-# Workarond: Around the time of this commit, the `criu` package
-# was found to be missing a recommends-dependency on criu-libs.
-# Until a fixed rpm lands in the Fedora repositories, manually
-# include it here.  This workaround should be removed once the
-# package is corrected (likely > 3.17.1-3).
-INSTALL_PACKAGES+=(criu-libs)
-
 # When installing during a container-build, having this present
 # will seriously screw up future dnf operations in very non-obvious ways.
 if ! ((CONTAINER)); then
@@ -205,7 +192,7 @@ DOWNLOAD_PACKAGES=(\
 )
 
 msg "Installing general build/test dependencies"
-bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
+bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
 msg "Downloading packages for optional installation at runtime, as needed."
 $SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"