opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-19 00:56:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27076 from Luap99/revert-debug

Browse Source 
Revert "test/e2e: try debug potential pasta issue"
This commit is contained in:
openshift-merge-bot[bot]
2025-09-17 14:38:46 +00:00
committed by GitHub
parent 9ac8845575 b24220b0a2
commit 54b51bbddf
2 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/pull_test.go
View File

@ -4,7 +4,6 @@ package integration
import ( import (
"fmt" "fmt"
"io"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
@ -668,33 +667,13 @@ var _ = Describe("Podman pull", func() {
podmanTest.AddImageToRWStore(ALPINE) podmanTest.AddImageToRWStore(ALPINE)
success := false
registryArgs := []string{"run", "-d", "--name", "registry", "-p", "5012:5000"}
if isRootless() { if isRootless() {
err := podmanTest.RestoreArtifact(REGISTRY_IMAGE) err := podmanTest.RestoreArtifact(REGISTRY_IMAGE)
Expect(err).ToNot(HaveOccurred()) 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") lock := GetPortLock("5012")
defer lock.Unlock() defer lock.Unlock()
session := podmanTest.Podman(registryArgs) session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5012:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -707,8 +686,6 @@ var _ = Describe("Podman pull", func() {
session = decryptionTestHelper(imgPath) session = decryptionTestHelper(imgPath)
Expect(session.LineInOutputContainsTag(imgPath, "latest")).To(BeTrue()) Expect(session.LineInOutputContainsTag(imgPath, "latest")).To(BeTrue())
success = true
}) })
}) })

27
test/e2e/run_test.go
View File

@ -4,7 +4,6 @@ package integration
import ( import (
"fmt" "fmt"
"io"
"net" "net"
"os" "os"
"path/filepath" "path/filepath"
@ -2354,31 +2353,9 @@ WORKDIR /madethis`, BB)
podmanTest.AddImageToRWStore(ALPINE) 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") lock := GetPortLock("5006")
defer lock.Unlock() defer lock.Unlock()
session := podmanTest.Podman(registryArgs) session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5006:5000", REGISTRY_IMAGE, "/entrypoint.sh", "/etc/docker/registry/config.yml"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -2412,8 +2389,6 @@ WORKDIR /madethis`, BB)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull " + imgPath)) Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull " + imgPath))
success = true
}) })
It("podman run --shm-size-systemd", func() { It("podman run --shm-size-systemd", func() {