use lookaside storage for remote tests

in an effort to speed up the remote testing, we should be using
lookaside storage to avoid pull images as well as importing multiple
images into the RW store.

one test was removed and added into system test by Ed in #8325

Signed-off-by: baude <bbaude@redhat.com>

1 files changed, 13 insertions, 15 deletions

diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 9ede3384f..c2e0f4407 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -160,10 +160,7 @@ var _ = Describe("Podman inspect", func() {
 	})
 
 	It("podman inspect shows healthcheck on docker image", func() {
-		pull := podmanTest.Podman([]string{"pull", healthcheck})
-		pull.WaitWithDefaultTimeout()
-		Expect(pull.ExitCode()).To(BeZero())
-
+		podmanTest.AddImageToRWStore(healthcheck)
 		session := podmanTest.Podman([]string{"inspect", "--format=json", healthcheck})
 		session.WaitWithDefaultTimeout()
 		imageData := session.InspectImageJSON()
@@ -248,12 +245,13 @@ var _ = Describe("Podman inspect", func() {
 	})
 
 	It("podman inspect container + image with same name gives container", func() {
+		podmanTest.AddImageToRWStore(ALPINE)
 		ctrName := "testcontainer"
-		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE, "sh"})
+		create := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE, "sh"})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
-		tag := podmanTest.PodmanNoCache([]string{"tag", ALPINE, ctrName + ":latest"})
+		tag := podmanTest.Podman([]string{"tag", ALPINE, ctrName + ":latest"})
 		tag.WaitWithDefaultTimeout()
 		Expect(tag.ExitCode()).To(Equal(0))
 
@@ -271,7 +269,7 @@ var _ = Describe("Podman inspect", func() {
 		}
 
 		ctrName := "hugo"
-		create := podmanTest.PodmanNoCache([]string{
+		create := podmanTest.Podman([]string{
 			"create", "--name", ctrName,
 			"--security-opt", "seccomp=unconfined",
 			"--security-opt", "label=type:spc_t",
@@ -291,7 +289,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect pod", func() {
 		podName := "testpod"
-		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -305,7 +303,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect pod with type", func() {
 		podName := "testpod"
-		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -320,7 +318,7 @@ var _ = Describe("Podman inspect", func() {
 	It("podman inspect latest pod", func() {
 		SkipIfRemote("--latest flag n/a")
 		podName := "testpod"
-		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -334,7 +332,7 @@ var _ = Describe("Podman inspect", func() {
 	It("podman inspect latest defaults to latest container", func() {
 		SkipIfRemote("--latest flag n/a")
 		podName := "testpod"
-		pod := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		pod := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		pod.WaitWithDefaultTimeout()
 		Expect(pod.ExitCode()).To(Equal(0))
 
@@ -388,7 +386,7 @@ var _ = Describe("Podman inspect", func() {
 	})
 	It("podman inspect --type container on a pod should fail", func() {
 		podName := "testpod"
-		create := podmanTest.PodmanNoCache([]string{"pod", "create", "--name", podName})
+		create := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -399,7 +397,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect --type network on a container should fail", func() {
 		ctrName := "testctr"
-		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -410,7 +408,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect --type pod on a container should fail", func() {
 		ctrName := "testctr"
-		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
@@ -421,7 +419,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect --type volume on a container should fail", func() {
 		ctrName := "testctr"
-		create := podmanTest.PodmanNoCache([]string{"create", "--name", ctrName, ALPINE})
+		create := podmanTest.Podman([]string{"create", "--name", ctrName, ALPINE})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))