Test new CI VMs

From containers/automation_images#325 Major change: netavark and aardvark are now included in prior-fedora, so CNI can be fully eliminated from CI (containers#21410) Signed-off-by: Ed Santiago <[email protected]>
edsantiago · Jan 30, 2024 · 9e04f0d · 9e04f0d
1 parent 7ed4478
commit 9e04f0d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -33,7 +33,7 @@ env:
     DEBIAN_NAME: "debian-13"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c20240102t212217z-f39f38d13"
+    IMAGE_SUFFIX: "c20240130t133129z-f39f38d13"
 
 
     # EC2 images

diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
@@ -294,8 +294,6 @@ remove_packaged_podman_files() {
     # Do so without running podman, lest that invocation initialize unwanted state.
     rm -f /run/podman/podman.sock  /run/user/$(id -u)/podman/podman.sock || true
 
-    rm -f $(podman info --format "{{.Host.RemoteSocket.Path}}")
-
     # yum/dnf/dpkg may list system directories, only remove files
     $LISTING_CMD | while read fullpath
     do

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
@@ -205,6 +205,11 @@ runroot = "/run/containers/storage"
 graphroot = "/var/lib/containers/storage"
 EOF
 
+# Since we've potentially changed important config settings, reset.
+# This prevents `database graph driver "" does not match "overlay"`
+# on Debian.
+rm -rf /var/lib/containers/storage
+
 # shellcheck disable=SC2154
 showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests"
 echo "STORAGE_FS=$CI_DESIRED_STORAGE" >>/etc/ci_environment
@@ -291,6 +296,10 @@ esac
 #
 # Either way, this block of code should be removed after March 31 2023
 # because it creates a system that is not representative of real-world Fedora.
+#
+# 2024-01-25 update: ha ha. This fix has proven so popular that it is
+# being used by other groups who were seeing the cdn03 flake. Looks like
+# we're stuck with it.
 if ((CONTAINER==0)); then
     nsswitch=/etc/authselect/nsswitch.conf
     if [[ -e $nsswitch ]]; then