From d711c3f46531376c8a7db848f52066f1a6f52b1b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 6 Nov 2023 10:26:33 -0700 Subject: [PATCH 1/3] VM images: bump to 2023-11-16 F39 released. Hoping for newer crun and pasta. Signed-off-by: Ed Santiago --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9275b10a01..ec251aff20 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-39β" + FEDORA_NAME: "fedora-39" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" PRIOR_FEDORA_NAME: "fedora-38" RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20231004t194547z-f39f38d13" + IMAGE_SUFFIX: "c20231116t174419z-f39f38d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" From 23ead49dee1d32fa946b5c8e626050bbeb3e1856 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 15 Nov 2023 19:08:02 -0700 Subject: [PATCH 2/3] pasta tests: remove some skips Signed-off-by: Ed Santiago --- test/system/505-networking-pasta.bats | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/system/505-networking-pasta.bats b/test/system/505-networking-pasta.bats index 4b7fe4f085..af342ddc84 100644 --- a/test/system/505-networking-pasta.bats +++ b/test/system/505-networking-pasta.bats @@ -448,10 +448,6 @@ function teardown() { } @test "Local forwarder, IPv4" { - if [[ "$CIRRUS_CI" == "true" ]] && [[ "$DISTRO_NV" == "debian-13" ]]; then - skip "FIXME: Needs passt 0.0~git20230625.32660ce-1 or later in debian SID, unavailable 8-2023." - fi - skip_if_no_ipv4 "IPv4 not routable on the host" run_podman run --dns 198.51.100.1 \ @@ -697,7 +693,7 @@ function teardown() { } @test "TCP/IPv4 large transfer, tap" { - skip "FIXME: #20170 - test hangs" + skip "FIXME: #20170 - needs passt >= 2023-11-10" pasta_test_do } From d2a4ec867d7622f7aeba696bb7824170c8b7baa4 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 16 Nov 2023 10:53:48 -0700 Subject: [PATCH 3/3] Test fixes for debian Signed-off-by: Ed Santiago --- test/e2e/run_test.go | 8 ++++++-- test/system/005-info.bats | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 713e61829d..b923fd5fbe 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1545,14 +1545,18 @@ VOLUME %s`, ALPINE, volPath, volPath) container.WaitWithDefaultTimeout() Expect(container).Should(Exit(0)) checkLines(container.OutputToStringArray()) - Expect(container.ErrorToString()).To(ContainSubstring("Running scope as unit: ")) + Expect(container.ErrorToString()).To(Or( + ContainSubstring("Running scope as unit: "), // systemd < 255 + ContainSubstring("Running as unit: "))) // systemd >= 255 // check that --cgroups=split is honored also when a container runs in a pod container = podmanTest.PodmanSystemdScope([]string{"run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup"}) container.WaitWithDefaultTimeout() Expect(container).Should(Exit(0)) checkLines(container.OutputToStringArray()) - Expect(container.ErrorToString()).To(ContainSubstring("Running scope as unit: ")) + Expect(container.ErrorToString()).To(Or( + ContainSubstring("Running scope as unit: "), // systemd < 255 + ContainSubstring("Running as unit: "))) // systemd >= 255 }) It("podman run with cgroups=disabled runs without cgroups", func() { diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 68f434f353..bdbbda0400 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -178,8 +178,13 @@ host.slirp4netns.executable | $expr_path @test "CONTAINERS_CONF_OVERRIDE" { skip_if_remote "remote does not support CONTAINERS_CONF*" + # Need to include runtime because it's runc in debian CI, + # and crun 1.11.1 barfs with "read from sync socket" containersConf=$PODMAN_TMPDIR/containers.conf cat >$containersConf <