Merge pull request #12527 from jwhonce/wip/manifest4

Refactor manifest list operations 

4 files changed, 82 insertions, 50 deletions

diff --git a/test/apiv2/15-manifest.at b/test/apiv2/15-manifest.at
new file mode 100644
index 000000000..0dd7026fa
--- /dev/null
+++ b/test/apiv2/15-manifest.at
@@ -0,0 +1,19 @@
+# -*- sh -*-
+#
+# Tests for manifest list endpoints
+
+t POST /v3.4.0/libpod/manifests/create?name=abc 200 \
+    .Id~[0-9a-f]\\{64\\}
+id_abc=$(jq -r '.Id' <<<"$output")
+
+t POST /v4.0.0/libpod/manifests/xyz 201 \
+    .Id~[0-9a-f]\\{64\\}
+echo xyz $output
+id_xyz=$(jq -r '.Id' <<<"$output")
+
+t GET /v3.4.0/libpod/manifests/$id_abc/exists 204
+t GET /v4.0.0/libpod/manifests/$id_xyz/exists 204
+
+# /v3.x cannot delete a manifest list
+t DELETE /v4.0.0/libpod/manifests/$id_abc 200
+t DELETE /v4.0.0/libpod/manifests/$id_xyz 200
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2
index 391095539..19e8c12d0 100755
--- a/test/apiv2/test-apiv2
+++ b/test/apiv2/test-apiv2
@@ -364,7 +364,9 @@ function start_service() {
     echo $WORKDIR
     # Some tests use shortnames; force registry override to work around
     # docker.io throttling.
-    env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf $PODMAN_BIN \
+#    FIXME esm revisit pulling expected images re: shortnames caused tests to fail
+#    env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf
+    $PODMAN_BIN \
         --root $WORKDIR/server_root --syslog=true \
         system service \
         --time 15 \
@@ -497,7 +499,7 @@ function wait_for_port() {
 ############
 function podman() {
     echo "\$ $PODMAN_BIN $*"                           >>$WORKDIR/output.log
-    env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf \
+#    env CONTAINERS_REGISTRIES_CONF=$TESTS_DIR/../registries.conf \
         $PODMAN_BIN --root $WORKDIR/server_root "$@"   >>$WORKDIR/output.log 2>&1
 }
 
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index 4644e3748..53e1fc8f2 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -80,7 +80,7 @@ func (p *PodmanTestIntegration) StartRemoteService() {
 
 	args := []string{}
 	if _, found := os.LookupEnv("DEBUG_SERVICE"); found {
-		args = append(args, "--log-level", "debug")
+		args = append(args, "--log-level", "trace")
 	}
 	remoteSocket := p.RemoteSocket
 	args = append(args, "system", "service", "--time", "0", remoteSocket)
@@ -151,7 +151,7 @@ func (p *PodmanTestIntegration) StopRemoteService() {
 	}
 }
 
-//MakeOptions assembles all the podman main options
+// MakeOptions assembles all the podman main options
 func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
 	podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s",
 		p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index 5978214ff..b86d5ecbe 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -44,19 +44,19 @@ var _ = Describe("Podman manifest", func() {
 		processTestResult(f)
 
 	})
-	It("podman manifest create", func() {
+	It("create w/o image", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 	})
 
-	It("podman manifest create", func() {
+	It("create w/ image", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo", imageList})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 	})
 
-	It("podman manifest inspect", func() {
+	It("inspect", func() {
 		session := podmanTest.Podman([]string{"manifest", "inspect", BB})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -71,29 +71,27 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session).Should(Exit(0))
 	})
 
-	It("podman manifest add", func() {
+	It("add w/ inspect", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		session = podmanTest.Podman([]string{"manifest", "add", "--arch=arm64", "foo", imageListInstance})
-		session.WaitWithDefaultTimeout()
-		Expect(session).Should(Exit(0))
-	})
+		id := strings.TrimSpace(string(session.Out.Contents()))
 
-	It("podman manifest add one", func() {
-		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
+		session = podmanTest.Podman([]string{"manifest", "inspect", id})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
+
 		session = podmanTest.Podman([]string{"manifest", "add", "--arch=arm64", "foo", imageListInstance})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
+
 		session = podmanTest.Podman([]string{"manifest", "inspect", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 		Expect(session.OutputToString()).To(ContainSubstring(imageListARM64InstanceDigest))
 	})
 
-	It("podman manifest tag", func() {
+	It("tag", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foobar"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -112,7 +110,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session2.OutputToString()).To(Equal(session.OutputToString()))
 	})
 
-	It("podman manifest add --all", func() {
+	It(" add --all", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -122,14 +120,17 @@ var _ = Describe("Podman manifest", func() {
 		session = podmanTest.Podman([]string{"manifest", "inspect", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListAMD64InstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListARMInstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListARM64InstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListPPC64LEInstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListS390XInstanceDigest))
+		Expect(session.OutputToString()).To(
+			And(
+				ContainSubstring(imageListAMD64InstanceDigest),
+				ContainSubstring(imageListARMInstanceDigest),
+				ContainSubstring(imageListARM64InstanceDigest),
+				ContainSubstring(imageListPPC64LEInstanceDigest),
+				ContainSubstring(imageListS390XInstanceDigest),
+			))
 	})
 
-	It("podman manifest add --os", func() {
+	It("add --os", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -142,7 +143,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session.OutputToString()).To(ContainSubstring(`"os": "bar"`))
 	})
 
-	It("podman manifest annotate", func() {
+	It("annotate", func() {
 		SkipIfRemote("Not supporting annotate on remote connections")
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
@@ -159,7 +160,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session.OutputToString()).To(ContainSubstring(`"architecture": "bar"`))
 	})
 
-	It("podman manifest remove", func() {
+	It("remove digest", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -176,14 +177,18 @@ var _ = Describe("Podman manifest", func() {
 		session = podmanTest.Podman([]string{"manifest", "inspect", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListAMD64InstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListARMInstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListPPC64LEInstanceDigest))
-		Expect(session.OutputToString()).To(ContainSubstring(imageListS390XInstanceDigest))
-		Expect(session.OutputToString()).To(Not(ContainSubstring(imageListARM64InstanceDigest)))
+		Expect(session.OutputToString()).To(
+			And(
+				ContainSubstring(imageListAMD64InstanceDigest),
+				ContainSubstring(imageListARMInstanceDigest),
+				ContainSubstring(imageListPPC64LEInstanceDigest),
+				ContainSubstring(imageListS390XInstanceDigest),
+				Not(
+					ContainSubstring(imageListARM64InstanceDigest)),
+			))
 	})
 
-	It("podman manifest remove not-found", func() {
+	It("remove not-found", func() {
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
@@ -199,7 +204,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session).Should(Exit(0))
 	})
 
-	It("podman manifest push", func() {
+	It("push --all", func() {
 		SkipIfRemote("manifest push to dir not supported in remote mode")
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
@@ -216,20 +221,24 @@ var _ = Describe("Podman manifest", func() {
 		session = podmanTest.Podman([]string{"manifest", "push", "--all", "foo", "dir:" + dest})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
+
 		files, err := filepath.Glob(dest + string(os.PathSeparator) + "*")
-		Expect(err).To(BeNil())
+		Expect(err).ShouldNot(HaveOccurred())
 		check := SystemExec("sha256sum", files)
 		check.WaitWithDefaultTimeout()
 		Expect(check).Should(Exit(0))
 		prefix := "sha256:"
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListAMD64InstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListARMInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListPPC64LEInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListS390XInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListARM64InstanceDigest, prefix)))
+		Expect(check.OutputToString()).To(
+			And(
+				ContainSubstring(strings.TrimPrefix(imageListAMD64InstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListARMInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListPPC64LEInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListS390XInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListARM64InstanceDigest, prefix)),
+			))
 	})
 
-	It("podman push --all", func() {
+	It("push", func() {
 		SkipIfRemote("manifest push to dir not supported in remote mode")
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
@@ -251,15 +260,19 @@ var _ = Describe("Podman manifest", func() {
 		check := SystemExec("sha256sum", files)
 		check.WaitWithDefaultTimeout()
 		Expect(check).Should(Exit(0))
+
 		prefix := "sha256:"
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListAMD64InstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListARMInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListPPC64LEInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListS390XInstanceDigest, prefix)))
-		Expect(check.OutputToString()).To(ContainSubstring(strings.TrimPrefix(imageListARM64InstanceDigest, prefix)))
+		Expect(check.OutputToString()).To(
+			And(
+				ContainSubstring(strings.TrimPrefix(imageListAMD64InstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListARMInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListPPC64LEInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListS390XInstanceDigest, prefix)),
+				ContainSubstring(strings.TrimPrefix(imageListARM64InstanceDigest, prefix)),
+			))
 	})
 
-	It("podman manifest push --rm", func() {
+	It("push --rm", func() {
 		SkipIfRemote("remote does not support --rm")
 		session := podmanTest.Podman([]string{"manifest", "create", "foo"})
 		session.WaitWithDefaultTimeout()
@@ -285,7 +298,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session).To(ExitWithError())
 	})
 
-	It("podman manifest exists", func() {
+	It("exists", func() {
 		manifestList := "manifest-list"
 		session := podmanTest.Podman([]string{"manifest", "create", manifestList})
 		session.WaitWithDefaultTimeout()
@@ -300,7 +313,7 @@ var _ = Describe("Podman manifest", func() {
 		Expect(session).Should(Exit(1))
 	})
 
-	It("podman manifest rm should not remove referenced images", func() {
+	It("rm should not remove referenced images", func() {
 		manifestList := "manifestlist"
 		imageName := "quay.io/libpod/busybox"
 
@@ -320,11 +333,9 @@ var _ = Describe("Podman manifest", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 
-		//image should still show up
-		session = podmanTest.Podman([]string{"images"})
+		// image should still show up
+		session = podmanTest.Podman([]string{"image", "exists", imageName})
 		session.WaitWithDefaultTimeout()
-		Expect(session.OutputToString()).To(ContainSubstring(imageName))
 		Expect(session).Should(Exit(0))
 	})
-
 })