From ae9120a71d8a270ce63a1dba12309154e6248c37 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 4 Dec 2024 18:17:59 +0100 Subject: [PATCH 1/3] Update VM images from https://github.com/containers/automation_images/pull/396 Signed-off-by: Paul Holzinger --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7ba243c5d8..04aeee601e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,7 +33,7 @@ env: DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20241118t130000z-f41f40d13" + IMAGE_SUFFIX: "c20241212t122344z-f41f40d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" From e74df8c35ad7be556b9b225eecf6fdea5bcefdfb Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 5 Dec 2024 15:04:36 +0100 Subject: [PATCH 2/3] test/e2e: remove outdated SkipOnOSVersion() calls Both of them are for fedora 36 which is long EOL and thus not run in our CI. Signed-off-by: Paul Holzinger --- test/e2e/run_userns_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 29e5323498..edac398588 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -93,7 +93,6 @@ var _ = Describe("Podman UserNS support", func() { It("podman uidmapping and gidmapping with an idmapped volume", func() { SkipIfRunc(podmanTest, "Test not supported yet with runc (issue 17433, wontfix)") - SkipOnOSVersion("fedora", "36") session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/foo"}) session.WaitWithDefaultTimeout() if strings.Contains(session.ErrorToString(), "Operation not permitted") { @@ -108,7 +107,6 @@ var _ = Describe("Podman UserNS support", func() { It("podman uidmapping and gidmapping with an idmapped volume on existing directory", func() { SkipIfRunc(podmanTest, "Test not supported yet with runc (issue 17433, wontfix)") - SkipOnOSVersion("fedora", "36") // The directory /mnt already exists in the image session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/mnt:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/mnt"}) session.WaitWithDefaultTimeout() From e6d8603136715663dc7383edd59e8e074afefd03 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 5 Dec 2024 15:09:07 +0100 Subject: [PATCH 3/3] test/e2e: SkipOnOSVersion() add reason field Signed-off-by: Paul Holzinger --- test/e2e/common_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index f4f5766116..939624074b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -923,10 +923,10 @@ func SkipIfNotSystemd(manager, reason string) { } } -func SkipOnOSVersion(os, version string) { +func SkipOnOSVersion(os, version string, reason string) { info := GetHostDistributionInfo() if info.Distribution == os && info.Version == version { - Skip(fmt.Sprintf("Test doesn't work on %s %s", os, version)) + Skip(fmt.Sprintf("[%s %s]: %s", os, version, reason)) } }