Merge pull request #23706 from edsantiago/new-vms

Update CI VMs
containers · Aug 22, 2024 · bd90f9c · bd90f9c
2 parents bfb3a17 + 4dc5708
commit bd90f9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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}"

diff --git 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
@@ -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())