diff --git a/.cirrus.yml b/.cirrus.yml index 3a459ed3c4..a20a9223e1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,14 +26,14 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-38" + FEDORA_NAME: "fedora-39β" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - PRIOR_FEDORA_NAME: "fedora-37" + PRIOR_FEDORA_NAME: "fedora-38" RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20230816t191118z-f38f37d13" + IMAGE_SUFFIX: "c20230928t004553z-f39f38d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 0d3158c58b..66ca09ebe3 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -596,12 +596,13 @@ var _ = Describe("Podman logs", func() { logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "--log-opt", "tag=äöüß", ALPINE, "echo", "podman"}) logc.WaitWithDefaultTimeout() Expect(logc).To(Exit(126)) + // FIXME-2023-09-26: conmon <2.1.8 logs to stdout; clean this up once >=2.1.8 is universal + errmsg := logc.ErrorToString() + logc.OutputToString() if !IsRemote() { // Error is only seen on local client - // Why does conmon log this to stdout? This must be fixed after https://github.com/containers/conmon/pull/447. - Expect(logc.OutputToString()).To(Equal("conmon: option parsing failed: Invalid byte sequence in conversion input")) + Expect(errmsg).To(ContainSubstring("conmon: option parsing failed: Invalid byte sequence in conversion input")) } - Expect(logc.ErrorToString()).To(ContainSubstring("conmon failed: exit status 1")) + Expect(errmsg).To(ContainSubstring("conmon failed: exit status 1")) }) It("podman logs with non ASCII log tag succeeds with proper env", func() { diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index b75bef339c..5f4ac82922 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -3,7 +3,6 @@ package integration import ( "fmt" "strconv" - "strings" "time" . "github.com/containers/podman/v4/test/utils" @@ -182,9 +181,6 @@ var _ = Describe("Podman stats", func() { // Regression test for #8265 It("podman stats with custom memory limits", func() { - if strings.Contains(podmanTest.OCIRuntime, "crun") { - Skip("Test requires crun > 1.8.4") - } // Run three containers. One with a memory limit. Make sure // that the limits are different and the limited one has a // lower limit. @@ -235,9 +231,6 @@ var _ = Describe("Podman stats", func() { }) It("podman stats show cgroup memory limit", func() { - if strings.Contains(podmanTest.OCIRuntime, "crun") { - Skip("Test requires crun > 1.8.4") - } ctrWithLimit := "with-limit" session := podmanTest.Podman([]string{"run", "-d", "--name", ctrWithLimit, "--memory", "50m", ALPINE, "top"}) diff --git a/test/system/505-networking-pasta.bats b/test/system/505-networking-pasta.bats index ebb61a61e5..2162254835 100644 --- a/test/system/505-networking-pasta.bats +++ b/test/system/505-networking-pasta.bats @@ -697,6 +697,7 @@ function teardown() { } @test "podman networking with pasta(1) - TCP/IPv4 large transfer, tap" { + skip "FIXME: #20170 - test hangs" pasta_test_do }