Update to Fedora 35 + 36

Signed-off-by: Chris Evich <[email protected]>
containers · Mar 24, 2022 · 0ae1608 · 0ae1608
1 parent b301a32
commit 0ae1608
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 27 deletions.
diff --git a/base_images/gce.yml b/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-20220324.n.0-CHECKSUM"
+    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-20220324.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

diff --git a/cache_images/fedora-netavark_packaging.sh b/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"

diff --git a/cache_images/fedora-podman-py_packaging.sh b/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
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
@@ -107,6 +107,7 @@ INSTALL_PACKAGES=(\
     ostree-devel
     pandoc
     parallel
+    perl-FindBin
     pkgconfig
     podman
     procps-ng
@@ -117,6 +118,7 @@ INSTALL_PACKAGES=(\
     python-pip-wheel
     python-setuptools-wheel
     python-wheel-wheel
+    python-toml
     python2
     python3-PyYAML
     python3-coverage
@@ -153,17 +155,11 @@ INSTALL_PACKAGES=(\
     zstd
 )
 
-# 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 ) ;;
-    *) 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"
+# test with CNI in F35 and lower
+EXARG=""
+if [[ "$OS_RELEASE_VER" -le 35 ]]; then
+    EXARG="--exclude=netavark --exclude=aardvark-dns"
+fi
 
 # When installing during a container-build, having this present
 # will seriously screw up future dnf operations in very non-obvious ways.
@@ -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
 
 

diff --git a/cache_images/podman_tooling.sh b/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

diff --git a/cache_images/ubuntu_setup.sh b/cache_images/ubuntu_setup.sh
@@ -23,7 +23,7 @@ bash $SCRIPT_DIRPATH/ubuntu_packaging.sh
 
 if ! ((CONTAINER)); then
     warn "Making Ubuntu kernel to enable cgroup swap accounting"
-    SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1/'
+    SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/'
     ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub.d/*
     ooe.sh $SUDO sed -re "$SEDCMD" -i /etc/default/grub
     ooe.sh $SUDO update-grub

diff --git a/podman/fedora_release b/podman/fedora_release
@@ -1 +1 @@
-35
+36
diff --git a/podman/prior-fedora_release b/podman/prior-fedora_release
@@ -1 +1 @@
-34
+35
-Original file line number
+Diff line change
@@ Expand Up / @@ -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"
@@ Expand Down @@