Skip to content

Commit

Permalink
test/e2e: use local skopeo not image
Browse files Browse the repository at this point in the history
The e2e tests already depend on skopeo anyway and pulling a over 300
MB image is not helpful for flakes but most importantly we see ENOSPC
flakes. I see them around the skopeo test so I assume the big image is
pushing the tmpfs limits so other tests running in parallel can start
failing because of it.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  • Loading branch information
Luap99 authored and openshift-cherrypick-robot committed Jun 4, 2024
1 parent d5a535b commit d5cc37f
Showing 1 changed file with 13 additions and 17 deletions.
30 changes: 13 additions & 17 deletions test/e2e/manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,11 @@ var _ = Describe("Podman manifest", func() {
// 4 images must be pushed two for gzip and two for zstd
Expect(output).To(ContainSubstring("Copying 4 images generated from 2 images in list"))

session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", "quay.io/skopeo/stable", "inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
skopeo := SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
Expect(skopeo).Should(ExitCleanly())
inspectData := []byte(skopeo.OutputToString())
var index imgspecv1.Index
inspectData := []byte(session.OutputToString())
err := json.Unmarshal(inspectData, &index)
err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred())

Expect(verifyInstanceCompression(index.Manifests, "zstd", "amd64")).Should(BeTrue())
Expand All @@ -254,10 +253,9 @@ var _ = Describe("Podman manifest", func() {
// 4 images must be pushed two for gzip and two for zstd
Expect(output).To(ContainSubstring("Copying 4 images generated from 2 images in list"))

session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", "quay.io/skopeo/stable", "inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
inspectData = []byte(session.OutputToString())
skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
Expect(skopeo).Should(ExitCleanly())
inspectData = []byte(skopeo.OutputToString())
err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred())

Expand All @@ -280,10 +278,9 @@ add_compression = ["zstd"]`), 0o644)
// 4 images must be pushed two for gzip and two for zstd
Expect(output).To(ContainSubstring("Copying 4 images generated from 2 images in list"))

session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", "quay.io/skopeo/stable", "inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
inspectData = []byte(session.OutputToString())
skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
Expect(skopeo).Should(ExitCleanly())
inspectData = []byte(skopeo.OutputToString())
err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred())

Expand All @@ -301,10 +298,9 @@ add_compression = ["zstd"]`), 0o644)
// 4 images must be pushed two for gzip and two for zstd
Expect(output).To(ContainSubstring("Copying 4 images generated from 2 images in list"))

session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", "quay.io/skopeo/stable", "inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
inspectData = []byte(session.OutputToString())
skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
Expect(skopeo).Should(ExitCleanly())
inspectData = []byte(skopeo.OutputToString())
err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred())

Expand Down

0 comments on commit d5cc37f

Please sign in to comment.