3 files changed, 29 insertions, 25 deletions
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 4b73004da..d47a3e47a 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -522,4 +522,31 @@ var _ = Describe("Podman pull", func() {
 		Expect(data[0].Os).To(Equal(runtime.GOOS))
 		Expect(data[0].Architecture).To(Equal("arm64"))
 	})
+
+	It("podman pull --arch", func() {
+		session := podmanTest.Podman([]string{"pull", "--arch=bogus", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+		expectedError := "no image found in manifest list for architecture bogus"
+		Expect(session.ErrorToString()).To(ContainSubstring(expectedError))
+
+		session = podmanTest.Podman([]string{"pull", "--arch=arm64", "--os", "windows", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(125))
+		expectedError = "no image found in manifest list for architecture"
+		Expect(session.ErrorToString()).To(ContainSubstring(expectedError))
+
+		session = podmanTest.Podman([]string{"pull", "-q", "--arch=arm64", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		setup := podmanTest.Podman([]string{"image", "inspect", session.OutputToString()})
+		setup.WaitWithDefaultTimeout()
+		Expect(setup.ExitCode()).To(Equal(0))
+
+		data := setup.InspectImageJSON() // returns []inspect.ImageData
+		Expect(len(data)).To(Equal(1))
+		Expect(data[0].Os).To(Equal(runtime.GOOS))
+		Expect(data[0].Architecture).To(Equal("arm64"))
+	})
 })
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index 10120751f..00b5802a3 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to local registry", func() {
-		SkipIfRemote("Remote does not support --digestfile or --remove-sginatures")
+		SkipIfRemote("Remote does not support --digestfile or --remove-signatures")
 		if podmanTest.Host.Arch == "ppc64le" {
 			Skip("No registry image for ppc64le")
 		}
@@ -145,7 +145,7 @@ var _ = Describe("Podman push", func() {
 		session = podmanTest.Podman([]string{"logs", "registry"})
 		session.WaitWithDefaultTimeout()
 
-		push := podmanTest.Podman([]string{"push", "--creds=podmantest:test", ALPINE, "localhost:5000/tlstest"})
+		push := podmanTest.Podman([]string{"push", "--format=v2s2", "--creds=podmantest:test", ALPINE, "localhost:5000/tlstest"})
 		push.WaitWithDefaultTimeout()
 		Expect(push).To(ExitWithError())
 
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 6b5bc68fb..7a42a4c18 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -29,29 +29,6 @@ EOF
     run_podman rmi -f build_test
 }
 
-@test "podman build - basic test with --pull" {
-    rand_filename=$(random_string 20)
-    rand_content=$(random_string 50)
-
-    run_podman tag $IMAGE localhost/localonly
-
-    tmpdir=$PODMAN_TMPDIR/build-test
-    mkdir -p $tmpdir
-    dockerfile=$tmpdir/Dockerfile
-    cat >$dockerfile <<EOF
-FROM localhost/localonly
-RUN echo $rand_content > /$rand_filename
-EOF
-    # With --pull, Podman would try to pull a newer image but use the local one
-    # if present. See #9111.
-    run_podman build --pull -t build_test $tmpdir
-
-    run_podman run --rm build_test cat /$rand_filename
-    is "$output"   "$rand_content"   "reading generated file in image"
-
-    run_podman rmi -f build_test localhost/localonly
-}
-
 @test "podman build - global runtime flags test" {
     skip_if_remote "--runtime-flag flag not supported for remote"