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

Merge pull request from Luap99/e2e-skopeo

Browse Source 
test/e2e: use local skopeo not image
This commit is contained in:
openshift-merge-bot[bot]
2024-06-03 14:00:08 +00:00
committed by GitHub
parent 0a28cd926f 164573dc34
commit ff0df4706a
1 changed files with 13 additions and 17 deletions

30
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 // 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")) 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"}) skopeo := SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout() Expect(skopeo).Should(ExitCleanly())
Expect(session).Should(Exit(0)) inspectData := []byte(skopeo.OutputToString())
var index imgspecv1.Index var index imgspecv1.Index
inspectData := []byte(session.OutputToString()) err = json.Unmarshal(inspectData, &index)
err := json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(verifyInstanceCompression(index.Manifests, "zstd", "amd64")).Should(BeTrue()) 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 // 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")) 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"}) skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout() Expect(skopeo).Should(ExitCleanly())
Expect(session).Should(ExitCleanly()) inspectData = []byte(skopeo.OutputToString())
inspectData = []byte(session.OutputToString())
err = json.Unmarshal(inspectData, &index) err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -280,10 +278,9 @@ add_compression = ["zstd"]`), 0o644)
// 4 images must be pushed two for gzip and two for zstd // 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")) 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"}) skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout() Expect(skopeo).Should(ExitCleanly())
Expect(session).Should(ExitCleanly()) inspectData = []byte(skopeo.OutputToString())
inspectData = []byte(session.OutputToString())
err = json.Unmarshal(inspectData, &index) err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -301,10 +298,9 @@ add_compression = ["zstd"]`), 0o644)
// 4 images must be pushed two for gzip and two for zstd // 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")) 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"}) skopeo = SystemExec("skopeo", []string{"inspect", "--tls-verify=false", "--raw", "docker://localhost:5007/list:latest"})
session.WaitWithDefaultTimeout() Expect(skopeo).Should(ExitCleanly())
Expect(session).Should(ExitCleanly()) inspectData = []byte(skopeo.OutputToString())
inspectData = []byte(session.OutputToString())
err = json.Unmarshal(inspectData, &index) err = json.Unmarshal(inspectData, &index)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())