Merge pull request #19541 from containers/renovate/major-ci-vm-image

Update dependency containers/automation_images to v20230807
containers · Aug 8, 2023 · d4f967c · d4f967c
2 parents 195f1be + 7ef0351
commit d4f967c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -33,7 +33,7 @@ env:
     DEBIAN_NAME: "debian-13"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c20230726t191046z-f38f37d13"
+    IMAGE_SUFFIX: "c20230807t144831z-f38f37d13"
 
     # EC2 images
     FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
@@ -243,13 +243,10 @@ validate_task:
             <<: *stdenvars
             VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
             DISTRO_NV: ${FEDORA_NAME}
-        # FIXME: #18612 c20230726t191046z-f38f37d13 Python dependnecies
-        # broken in rawhide image cause this task to fail.  Re-enable
-        # check if fixed in next set of images.
-        # - env:
-        #     <<: *stdenvars
-        #     VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
-        #     DISTRO_NV: ${RAWHIDE_NAME}
+        - env:
+            <<: *stdenvars
+            VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
+            DISTRO_NV: ${RAWHIDE_NAME}
     env:
         TEST_FLAVOR: validate
     # N/B: This script depends on ${DISTRO_NV} being defined for the task.

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
@@ -147,6 +147,7 @@ case "$OS_RELEASE_ID" in
     debian)
         # FIXME 2023-04-11: workaround for runc regression causing failure
         # in system tests: "skipping device /dev/char/10:200 for systemd"
+        # (Checked on 2023-08-08 and it's still too old: 1.1.5)
         # FIXME: please remove this once runc >= 1.2 makes it into debian.
         modprobe tun
         ;;

diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
@@ -341,8 +341,6 @@ var _ = Describe("Podman checkpoint", func() {
 	})
 
 	It("podman checkpoint container with established tcp connections", func() {
-		// Broken on Ubuntu.
-		SkipIfNotFedora()
 		localRunString := getRunString([]string{REDIS_IMAGE})
 		session := podmanTest.Podman(localRunString)
 		session.WaitWithDefaultTimeout()

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
@@ -817,10 +817,10 @@ func SkipOnOSVersion(os, version string) {
 	}
 }
 
-func SkipIfNotFedora() {
+func SkipIfNotFedora(reason string) {
 	info := GetHostDistributionInfo()
 	if info.Distribution != "fedora" {
-		Skip("Test can only run on Fedora")
+		Skip(reason)
 	}
 }
 

diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
@@ -408,6 +408,7 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec cannot be invoked", func() {
+		SkipIfNotFedora("FIXME: #19552 fails on Debian SID w/ runc 1.1.5")
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup).Should(Exit(0))