Update to Fedora 35 + 36

Signed-off-by: Chris Evich <[email protected]>

base_images/gce.yml

@@ -29,12 +29,12 @@ variables:  # Empty value means it must be passed in on command-line
     # N/B: There are Fedora-Cloud...GCP.tar.gz images available, however
     #      as of this comment, they lack the cloud-init package which is
     #      required by GCP for startup resizing of the rootfs.
-    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-35-1.2-x86_64-CHECKSUM"
-    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
+    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-36-x86_64-20220310.n.0-CHECKSUM"
+    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-20220310.n.0.x86_64.qcow2"
 
     # Prior Fedora release
-    PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-34-1.2-x86_64-CHECKSUM"
-    PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2"
+    PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-35-1.2-x86_64-CHECKSUM"
+    PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
 
 
 # Don't leak sensitive values in error messages / output

cache_images/fedora-netavark_packaging.sh

@@ -55,7 +55,6 @@ INSTALL_PACKAGES=(\
     zip
 )
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
 EXARG="--exclude=netavark --exclude=aardvark-dns --exclude=cargo --exclude=rust"
 
 msg "Installing general build/test dependencies"

cache_images/fedora-podman-py_packaging.sh

@@ -86,11 +86,8 @@ INSTALL_PACKAGES=(\
     zstd
 )
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
-EXARG="--exclude=netavark --exclude=aardvark-dns"
-
 echo "Installing general build/test dependencies"
-bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
+bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
 # It was observed in F33, dnf install doesn't always get you the latest/greatest
 lilto $SUDO dnf update -y

cache_images/fedora_packaging.sh

@@ -155,16 +155,12 @@ INSTALL_PACKAGES=(\
 
 # Perl module packaging changes between F32 and F33
 case "$OS_RELEASE_VER" in
-    32) INSTALL_PACKAGES+=( python3-pytoml ) ;;
-    33) ;&
-    34) ;&
-    35) INSTALL_PACKAGES+=( perl-FindBin python-toml ) ;;
+    35) EXARG="--exclude=netavark --exclude=aardvark-dns"
+        INSTALL_PACKAGES+=( perl-FindBin python-toml ) ;;
+    36) EXARG="" ;;
     *) die "Unknown/Unsupported \$OS_REL_VER '$OS_REL_VER'" ;;
 esac
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
-EXARG="--exclude=netavark --exclude=aardvark-dns"
-
 # When installing during a container-build, having this present
 # will seriously screw up future dnf operations in very non-obvious ways.
 if ! ((CONTAINER)); then
@@ -174,10 +170,6 @@ if ! ((CONTAINER)); then
         selinux-policy-devel
         policycoreutils
     )
-else
-    if [[ "$OS_RELEASE_VER" -lt 35 ]]; then
-        EXARG="$EXARG --exclude=selinux*"
-    fi
 fi
 
 

cache_images/podman_tooling.sh

@@ -27,6 +27,9 @@ else  # Fedora
     $SUDO curl --fail -s -o /usr/local/bin/swagger -L'#' "$download_url"
     $SUDO chmod +x /usr/local/bin/swagger
     /usr/local/bin/swagger version
+
+    # This is needed for rootless testing
+    $SUDO make install.modules-load
 fi
 
 # Make pristine for other runtime usage/expectations also save a bit

podman/fedora_release

@@ -1 +1 @@
-35
+36

podman/prior-fedora_release

@@ -1 +1 @@
-34
+35