From 0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 22 Apr 2021 08:01:12 +0200 Subject: migrate Podman to containers/common/libimage Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg --- test/e2e/common_test.go | 2 +- test/e2e/load_test.go | 2 +- test/e2e/prune_test.go | 11 +++++++++-- test/e2e/pull_test.go | 16 ++++++++-------- test/e2e/testdata/docker-name-only.tar.xz | Bin 0 -> 1024 bytes test/e2e/testdata/docker-registry-name.tar.xz | Bin 0 -> 1028 bytes test/e2e/testdata/docker-two-images.tar.xz | Bin 0 -> 1416 bytes test/e2e/testdata/docker-two-names.tar.xz | Bin 0 -> 1040 bytes test/e2e/testdata/docker-unnamed.tar.xz | Bin 0 -> 968 bytes test/e2e/testdata/image | 1 - test/e2e/testdata/oci-name-only.tar.gz | Bin 0 -> 975 bytes test/e2e/testdata/oci-non-docker-name.tar.gz | Bin 0 -> 991 bytes test/e2e/testdata/oci-registry-name.tar.gz | Bin 0 -> 979 bytes test/e2e/testdata/oci-unnamed.tar.gz | Bin 0 -> 928 bytes test/e2e/testdata/registries.conf | 4 ++++ test/e2e/tree_test.go | 3 +-- 16 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 test/e2e/testdata/docker-name-only.tar.xz create mode 100644 test/e2e/testdata/docker-registry-name.tar.xz create mode 100644 test/e2e/testdata/docker-two-images.tar.xz create mode 100644 test/e2e/testdata/docker-two-names.tar.xz create mode 100644 test/e2e/testdata/docker-unnamed.tar.xz delete mode 120000 test/e2e/testdata/image create mode 100644 test/e2e/testdata/oci-name-only.tar.gz create mode 100644 test/e2e/testdata/oci-non-docker-name.tar.gz create mode 100644 test/e2e/testdata/oci-registry-name.tar.gz create mode 100644 test/e2e/testdata/oci-unnamed.tar.gz create mode 100644 test/e2e/testdata/registries.conf (limited to 'test/e2e') diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 9ae56d7ce..8530d3dd3 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -320,7 +320,7 @@ func (p *PodmanTestIntegration) createArtifact(image string) { fmt.Printf("Caching %s at %s...", image, destName) if _, err := os.Stat(destName); os.IsNotExist(err) { pull := p.PodmanNoCache([]string{"pull", image}) - pull.Wait(240) + pull.Wait(440) Expect(pull.ExitCode()).To(Equal(0)) save := p.PodmanNoCache([]string{"save", "-o", destName, image}) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index 267f18b0a..3bd75a8f2 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -286,7 +286,7 @@ var _ = Describe("Podman load", func() { }) It("podman load multi-image archive", func() { - result := podmanTest.Podman([]string{"load", "-i", "./testdata/image/docker-two-images.tar.xz"}) + result := podmanTest.Podman([]string{"load", "-i", "./testdata/docker-two-images.tar.xz"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) Expect(result.LineInOutputContains("example.com/empty:latest")).To(BeTrue()) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index cbe38fc76..38f893a43 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -104,8 +104,9 @@ var _ = Describe("Podman prune", func() { after := podmanTest.Podman([]string{"images", "-a"}) after.WaitWithDefaultTimeout() Expect(none.ExitCode()).To(Equal(0)) + // Check if all "dangling" images were pruned. hasNoneAfter, _ := after.GrepString("") - Expect(hasNoneAfter).To(BeTrue()) + Expect(hasNoneAfter).To(BeFalse()) Expect(len(after.OutputToStringArray()) > 1).To(BeTrue()) }) @@ -135,12 +136,18 @@ var _ = Describe("Podman prune", func() { It("podman image prune unused images", func() { podmanTest.AddImageToRWStore(ALPINE) podmanTest.AddImageToRWStore(BB) + + images := podmanTest.Podman([]string{"images", "-a"}) + images.WaitWithDefaultTimeout() + Expect(images.ExitCode()).To(Equal(0)) + prune := podmanTest.Podman([]string{"image", "prune", "-af"}) prune.WaitWithDefaultTimeout() Expect(prune.ExitCode()).To(Equal(0)) - images := podmanTest.Podman([]string{"images", "-aq"}) + images = podmanTest.Podman([]string{"images", "-aq"}) images.WaitWithDefaultTimeout() + Expect(images.ExitCode()).To(Equal(0)) // all images are unused, so they all should be deleted! Expect(len(images.OutputToStringArray())).To(Equal(len(CACHE_IMAGES))) }) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 5308548f1..c60ad9487 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -86,7 +86,7 @@ var _ = Describe("Podman pull", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session = podmanTest.Podman([]string{"rmi", "testdigest_v2s2:none"}) + session = podmanTest.Podman([]string{"rmi", "testdigest_v2s2"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) @@ -256,7 +256,7 @@ var _ = Describe("Podman pull", func() { // Pulling a multi-image archive without further specifying // which image _must_ error out. Pulling is restricted to one // image. - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) expectedError := "Unexpected tar manifest.json: expected 1 item, got 2" @@ -265,31 +265,31 @@ var _ = Describe("Podman pull", func() { // Now pull _one_ image from a multi-image archive via the name // and index syntax. - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:@0")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:@0")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:example.com/empty:latest")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:example.com/empty:latest")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:@1")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:@1")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:example.com/empty/but:different")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:example.com/empty/but:different")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) // Now check for some errors. - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:foo.com/does/not/exist:latest")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:foo.com/does/not/exist:latest")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) expectedError = "Tag \"foo.com/does/not/exist:latest\" not found" found, _ = session.ErrorGrepString(expectedError) Expect(found).To(Equal(true)) - session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/image/docker-two-images.tar.xz:@2")}) + session = podmanTest.Podman([]string{"pull", fmt.Sprintf("docker-archive:./testdata/docker-two-images.tar.xz:@2")}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) expectedError = "Invalid source index @2, only 2 manifest items available" diff --git a/test/e2e/testdata/docker-name-only.tar.xz b/test/e2e/testdata/docker-name-only.tar.xz new file mode 100644 index 000000000..0cad9f108 Binary files /dev/null and b/test/e2e/testdata/docker-name-only.tar.xz differ diff --git a/test/e2e/testdata/docker-registry-name.tar.xz b/test/e2e/testdata/docker-registry-name.tar.xz new file mode 100644 index 000000000..181816c2e Binary files /dev/null and b/test/e2e/testdata/docker-registry-name.tar.xz differ diff --git a/test/e2e/testdata/docker-two-images.tar.xz b/test/e2e/testdata/docker-two-images.tar.xz new file mode 100644 index 000000000..148d8a86b Binary files /dev/null and b/test/e2e/testdata/docker-two-images.tar.xz differ diff --git a/test/e2e/testdata/docker-two-names.tar.xz b/test/e2e/testdata/docker-two-names.tar.xz new file mode 100644 index 000000000..07fbc479c Binary files /dev/null and b/test/e2e/testdata/docker-two-names.tar.xz differ diff --git a/test/e2e/testdata/docker-unnamed.tar.xz b/test/e2e/testdata/docker-unnamed.tar.xz new file mode 100644 index 000000000..ba6ea1bae Binary files /dev/null and b/test/e2e/testdata/docker-unnamed.tar.xz differ diff --git a/test/e2e/testdata/image b/test/e2e/testdata/image deleted file mode 120000 index a9e67bf9a..000000000 --- a/test/e2e/testdata/image +++ /dev/null @@ -1 +0,0 @@ -../../../libpod/image/testdata/ \ No newline at end of file diff --git a/test/e2e/testdata/oci-name-only.tar.gz b/test/e2e/testdata/oci-name-only.tar.gz new file mode 100644 index 000000000..57bc07564 Binary files /dev/null and b/test/e2e/testdata/oci-name-only.tar.gz differ diff --git a/test/e2e/testdata/oci-non-docker-name.tar.gz b/test/e2e/testdata/oci-non-docker-name.tar.gz new file mode 100644 index 000000000..5ffc0eabd Binary files /dev/null and b/test/e2e/testdata/oci-non-docker-name.tar.gz differ diff --git a/test/e2e/testdata/oci-registry-name.tar.gz b/test/e2e/testdata/oci-registry-name.tar.gz new file mode 100644 index 000000000..e6df87339 Binary files /dev/null and b/test/e2e/testdata/oci-registry-name.tar.gz differ diff --git a/test/e2e/testdata/oci-unnamed.tar.gz b/test/e2e/testdata/oci-unnamed.tar.gz new file mode 100644 index 000000000..de445fdf8 Binary files /dev/null and b/test/e2e/testdata/oci-unnamed.tar.gz differ diff --git a/test/e2e/testdata/registries.conf b/test/e2e/testdata/registries.conf new file mode 100644 index 000000000..16622a1ac --- /dev/null +++ b/test/e2e/testdata/registries.conf @@ -0,0 +1,4 @@ +short-name-mode="enforcing" + +[aliases] +"busybox"="docker.io/library/busybox" diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 184b99dfb..33c69554b 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -34,8 +34,7 @@ var _ = Describe("Podman image tree", func() { }) It("podman image tree", func() { - SkipIfRemote("Does not work on remote client") - Skip("don't understand why this fails") + SkipIfRemote("podman-image-tree is not supported for remote clients") podmanTest.AddImageToRWStore(cirros) dockerfile := `FROM quay.io/libpod/cirros:latest RUN mkdir hello -- cgit v1.2.3-54-g00ecf