From 8c0332d2a87decc44e24e4dffbcf3cc6e4ecc713 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 29 Jan 2024 10:45:00 -0700
Subject: [PATCH] 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 <santiago@redhat.com>
---
 IMG_SFX                          |  2 +-
 base_images/debian_base-setup.sh |  4 ++--
 cache_images/fedora_packaging.sh | 17 ++---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/IMG_SFX b/IMG_SFX
index 242d8ac2..bdc2e8d4 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20240125t184057z-f39f38d13
+20240201t143038z-f39f38d13
diff --git a/base_images/debian_base-setup.sh b/base_images/debian_base-setup.sh
index 09518d5f..d14a5807 100644
--- a/base_images/debian_base-setup.sh
+++ b/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"
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
index 378013b7..8416b06b 100644
--- a/cache_images/fedora_packaging.sh
+++ b/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"