Merge pull request #24225 from Luap99/pasta-hang

test/e2e: try debug potential pasta issue
containers · Oct 10, 2024 · 569d005 · 569d005 · packit-as-a-service · Oct 10, 2024
2 parents 9a887d1 + f517e52
commit 569d005
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 2 deletions.
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -664,13 +665,33 @@ var _ = Describe("Podman pull", func() {
 
 			podmanTest.AddImageToRWStore(ALPINE)
 
+			success := false
+			registryArgs := []string{"run", "-d", "--name", "registry", "-p", "5012:5000"}
 			if isRootless() {
 				err := podmanTest.RestoreArtifact(REGISTRY_IMAGE)
 				Expect(err).ToNot(HaveOccurred())
+
+				// Debug code for https://github.com/containers/podman/issues/24219
+				logFile := filepath.Join(podmanTest.TempDir, "pasta.log")
+				registryArgs = append(registryArgs, "--network", "pasta:--trace,--log-file,"+logFile)
+				defer func() {
+					if success {
+						// only print the log on errors otherwise it will clutter CI logs way to much
+						return
+					}
+
+					f, err := os.Open(logFile)
+					Expect(err).ToNot(HaveOccurred())
+					defer f.Close()
+					GinkgoWriter.Println("pasta trace log:")
+					_, err = io.Copy(GinkgoWriter, f)
+					Expect(err).ToNot(HaveOccurred())
+				}()
 			}
+			registryArgs = append(registryArgs, REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml")
 			lock := GetPortLock("5012")
 			defer lock.Unlock()
-			session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5012:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
+			session := podmanTest.Podman(registryArgs)
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(ExitCleanly())
 
@@ -683,6 +704,8 @@ var _ = Describe("Podman pull", func() {
 			session = decryptionTestHelper(imgPath)
 
 			Expect(session.LineInOutputContainsTag(imgPath, "latest")).To(BeTrue())
+
+			success = true
 		})
 	})
 

diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"path/filepath"
@@ -2182,9 +2183,31 @@ WORKDIR /madethis`, BB)
 
 		podmanTest.AddImageToRWStore(ALPINE)
 
+		success := false
+		registryArgs := []string{"run", "-d", "--name", "registry", "-p", "5006:5000"}
+		if isRootless() {
+			// Debug code for https://github.com/containers/podman/issues/24219
+			logFile := filepath.Join(podmanTest.TempDir, "pasta.log")
+			registryArgs = append(registryArgs, "--network", "pasta:--trace,--log-file,"+logFile)
+			defer func() {
+				if success {
+					// only print the log on errors otherwise it will clutter CI logs way to much
+					return
+				}
+
+				f, err := os.Open(logFile)
+				Expect(err).ToNot(HaveOccurred())
+				defer f.Close()
+				GinkgoWriter.Println("pasta trace log:")
+				_, err = io.Copy(GinkgoWriter, f)
+				Expect(err).ToNot(HaveOccurred())
+			}()
+		}
+		registryArgs = append(registryArgs, REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml")
+
 		lock := GetPortLock("5006")
 		defer lock.Unlock()
-		session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5006:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
+		session := podmanTest.Podman(registryArgs)
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 
@@ -2218,6 +2241,8 @@ WORKDIR /madethis`, BB)
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull " + imgPath))
+
+		success = true
 	})
 
 	It("podman run --shm-size-systemd", func() {