From 154d832696d5a49e0ff20fa46fe5556e64c2e073 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 21 Aug 2024 11:35:19 -0600 Subject: [PATCH 1/2] Test new VM build Mostly to get pasta 08-14 but also a ton more changes elsewhere. https://github.com/containers/automation_images/pull/383 Signed-off-by: Ed Santiago --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 25201af5cb..b8f650bd21 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,7 +33,7 @@ env: DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20240805t173227z-f40f39d13" + IMAGE_SUFFIX: "c20240821t171500z-f40f39d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" From 4dc5708f14fe768236c586006bb86d3a349eaa04 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 22 Aug 2024 04:55:32 -0600 Subject: [PATCH 2/2] Revert "test/e2e: work around for pasta issue" This reverts commit 1912dd4bf68a567648aee96d10784fb49eacacd0. Signed-off-by: Ed Santiago --- test/e2e/pull_test.go | 3 +-- test/e2e/run_test.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index e96de6709e..5523047ab9 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -670,8 +670,7 @@ var _ = Describe("Podman pull", func() { } lock := GetPortLock("5012") defer lock.Unlock() - // FIXME: #23517: using network slirp4netns as work around - session := podmanTest.Podman([]string{"run", "-d", "--network", "slirp4netns", "--name", "registry", "-p", "5012:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"}) + session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5012:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"}) session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly()) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 1cb033f713..07c4751f54 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -2162,8 +2162,7 @@ WORKDIR /madethis`, BB) lock := GetPortLock("5006") defer lock.Unlock() - // FIXME: #23517: using network slirp4netns as work around - session := podmanTest.Podman([]string{"run", "-d", "--network", "slirp4netns", "--name", "registry", "-p", "5006:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"}) + session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5006:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"}) session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly())