From dfd2e5787e661c04c7eac0a6a162fdf02cefb879 Mon Sep 17 00:00:00 2001 From: Ed Santiago 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 --- IMG_SFX | 2 +- cache_images/fedora_packaging.sh | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/IMG_SFX b/IMG_SFX index 242d8ac2..b7774c6b 100644 --- a/IMG_SFX +++ b/IMG_SFX @@ -1 +1 @@ -20240125t184057z-f39f38d13 +20240129t174741z-f39f38d13 diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh index 378013b7..8afc8f5d 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