Cirrus: Freshen VM images

Specifically, this brings in `crun 1.4-1` allowing removal of a temporary workaround. Ref: containers#12759 Signed-off-by: Chris Evich <[email protected]>
cevich · Jan 10, 2022 · 7990782 · 7990782
1 parent 0e4e5cf
commit 7990782
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -29,7 +29,7 @@ env:
     UBUNTU_NAME: "ubuntu-2110"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c6015869890330624"
+    IMAGE_SUFFIX: "c6454758209748992"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
@@ -118,12 +118,6 @@ fi
 case "$OS_RELEASE_ID" in
     ubuntu) ;;
     fedora)
-        # Force a crun version that has this fix: https://github.com/containers/crun/pull/819
-        # FIXME: Remove once a fixed crun made its way into Fedora
-        if test "$OS_RELEASE_VER" == "35"; then
-            yum upgrade -y crun
-        fi
-
         if ((CONTAINER==0)); then
             # All SELinux distros need this for systemd-in-a-container
             msg "Enabling container_manage_cgroup"