From 164573dc345da987eceecc076f50e7bb2c9f2ca5 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 3 Jun 2024 12:26:59 +0200 Subject: [PATCH] test/e2e: use local skopeo not image 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 --- test/e2e/manifest_test.go | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 0c73d27b75..52384b051f 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -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()) @@ -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()) @@ -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()) @@ -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())