New VMs: include netavark in prior-fedora

CNI is deprecated, and will no longer be tested in CI (Podman PR 21410). We've been force-removing netavark from prior-fedora. Remove this special case so now all fedorae have netavark. Signed-off-by: Ed Santiago <[email protected]>
containers · Jan 30, 2024 · 843f9ef · 843f9ef
1 parent c6ce03e
commit 843f9ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/IMG_SFX b/IMG_SFX
@@ -1 +1 @@
-20240125t184057z-f39f38d13
+20240130t163901z-f39f38d13
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
@@ -37,7 +37,15 @@ msg "Updating/Installing repos and packages for $OS_REL_VER"
 
 bigto ooe.sh $SUDO dnf update -y
 
+# netavark crisis of 2024-01-27 weekend.
+#  1) netavark *should* force install of aardvark, but right now does not
+#  2) aardvark-dns-1.10.0-1 is broken, force 1.9. See:
+#       https://github.com/containers/podman/pull/21366#issuecomment-1917359468
+timebomb 20240210 "Please remove aardvark and netavark from INSTALL_PACKAGES once they both > 1.10.1"
+
 INSTALL_PACKAGES=(\
+    aardvark-dns-1.9.0
+    netavark-1.9.0
     autoconf
     automake
     bash-completion
@@ -140,13 +148,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 +175,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 +200,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"