use imagecaches for local tests

when doing localized tests (not varlink), we can use secondary image
stores as read-only image caches.  this cuts down on test time
significantly because each test does not need to restore the images from
a tarball anymore.

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

1 files changed, 46 insertions, 41 deletions

diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 0e193640e..9209e1770 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -3,6 +3,7 @@
 package integration
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 
@@ -38,7 +39,11 @@ var _ = Describe("Podman load", func() {
 	It("podman load input flag", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, ALPINE})
+		images := podmanTest.PodmanNoCache([]string{"images"})
+		images.WaitWithDefaultTimeout()
+		fmt.Println(images.OutputToStringArray())
+
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
@@ -46,7 +51,7 @@ var _ = Describe("Podman load", func() {
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
@@ -54,7 +59,7 @@ var _ = Describe("Podman load", func() {
 	It("podman load compressed tar file", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, ALPINE})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
@@ -62,11 +67,11 @@ var _ = Describe("Podman load", func() {
 		Expect(compress.ExitCode()).To(Equal(0))
 		outfile = outfile + ".gz"
 
-		rmi := podmanTest.Podman([]string{"rmi", ALPINE})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", ALPINE})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
@@ -74,15 +79,15 @@ var _ = Describe("Podman load", func() {
 	It("podman load oci-archive image", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, "--format", "oci-archive", ALPINE})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "--format", "oci-archive", ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
-		rmi := podmanTest.Podman([]string{"rmi", ALPINE})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", ALPINE})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
@@ -90,15 +95,15 @@ var _ = Describe("Podman load", func() {
 	It("podman load oci-archive with signature", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, "--format", "oci-archive", ALPINE})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "--format", "oci-archive", ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
-		rmi := podmanTest.Podman([]string{"rmi", ALPINE})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", ALPINE})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "--signature-policy", "/etc/containers/policy.json", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "--signature-policy", "/etc/containers/policy.json", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
@@ -106,15 +111,15 @@ var _ = Describe("Podman load", func() {
 	It("podman load with quiet flag", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, ALPINE})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
-		rmi := podmanTest.Podman([]string{"rmi", ALPINE})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", ALPINE})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-q", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "-q", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
@@ -122,7 +127,7 @@ var _ = Describe("Podman load", func() {
 	It("podman load directory", func() {
 		outdir := filepath.Join(podmanTest.TempDir, "alpine")
 
-		save := podmanTest.Podman([]string{"save", "--format", "oci-dir", "-o", outdir, ALPINE})
+		save := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-dir", "-o", outdir, ALPINE})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
@@ -136,7 +141,7 @@ var _ = Describe("Podman load", func() {
 	})
 
 	It("podman load bogus file", func() {
-		save := podmanTest.Podman([]string{"load", "-i", "foobar.tar"})
+		save := podmanTest.PodmanNoCache([]string{"load", "-i", "foobar.tar"})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).ToNot(Equal(0))
 	})
@@ -148,75 +153,75 @@ var _ = Describe("Podman load", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
 		alpVersion := "docker.io/library/alpine:3.2"
 
-		pull := podmanTest.Podman([]string{"pull", alpVersion})
+		pull := podmanTest.PodmanNoCache([]string{"pull", alpVersion})
 		pull.WaitWithDefaultTimeout()
 		Expect(pull.ExitCode()).To(Equal(0))
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, ALPINE, alpVersion})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, ALPINE, alpVersion})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 
-		rmi := podmanTest.Podman([]string{"rmi", ALPINE, alpVersion})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", ALPINE, alpVersion})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-i", outfile})
+		result := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 
-		inspect := podmanTest.Podman([]string{"inspect", ALPINE})
+		inspect := podmanTest.PodmanNoCache([]string{"inspect", ALPINE})
 		inspect.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
-		inspect = podmanTest.Podman([]string{"inspect", alpVersion})
+		inspect = podmanTest.PodmanNoCache([]string{"inspect", alpVersion})
 		inspect.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})
 
 	It("podman load localhost registry from scratch", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz")
-		setup := podmanTest.Podman([]string{"tag", ALPINE, "hello:world"})
+		setup := podmanTest.PodmanNoCache([]string{"tag", ALPINE, "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"save", "-o", outfile, "--format", "oci-archive", "hello:world"})
+		setup = podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "--format", "oci-archive", "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"rmi", "hello:world"})
+		setup = podmanTest.PodmanNoCache([]string{"rmi", "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		load := podmanTest.Podman([]string{"load", "-i", outfile})
+		load := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		load.WaitWithDefaultTimeout()
 		Expect(load.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"images", "hello:world"})
+		result := podmanTest.PodmanNoCache([]string{"images", "hello:world"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
 		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
 	})
 
 	It("podman load localhost registry from scratch and :latest", func() {
+		podmanTest.RestoreArtifact(fedoraMinimal)
 		outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz")
-		podmanTest.RestoreArtifact("fedora-minimal:latest")
 
-		setup := podmanTest.Podman([]string{"tag", "fedora-minimal", "hello"})
+		setup := podmanTest.PodmanNoCache([]string{"tag", "fedora-minimal", "hello"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"save", "-o", outfile, "--format", "oci-archive", "hello"})
+		setup = podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "--format", "oci-archive", "hello"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"rmi", "hello"})
+		setup = podmanTest.PodmanNoCache([]string{"rmi", "hello"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		load := podmanTest.Podman([]string{"load", "-i", outfile})
+		load := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		load.WaitWithDefaultTimeout()
 		Expect(load.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"images", "hello:latest"})
+		result := podmanTest.PodmanNoCache([]string{"images", "hello:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
 		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
@@ -225,23 +230,23 @@ var _ = Describe("Podman load", func() {
 	It("podman load localhost registry from dir", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "load")
 
-		setup := podmanTest.Podman([]string{"tag", BB, "hello:world"})
+		setup := podmanTest.PodmanNoCache([]string{"tag", BB, "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"save", "-o", outfile, "--format", "oci-dir", "hello:world"})
+		setup = podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "--format", "oci-dir", "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		setup = podmanTest.Podman([]string{"rmi", "hello:world"})
+		setup = podmanTest.PodmanNoCache([]string{"rmi", "hello:world"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
-		load := podmanTest.Podman([]string{"load", "-i", outfile})
+		load := podmanTest.PodmanNoCache([]string{"load", "-i", outfile})
 		load.WaitWithDefaultTimeout()
 		Expect(load.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"images", "load:latest"})
+		result := podmanTest.PodmanNoCache([]string{"images", "load:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.LineInOutputContains("docker")).To(Not(BeTrue()))
 		Expect(result.LineInOutputContains("localhost")).To(BeTrue())
@@ -250,17 +255,17 @@ var _ = Describe("Podman load", func() {
 	It("podman load xz compressed image", func() {
 		outfile := filepath.Join(podmanTest.TempDir, "bb.tar")
 
-		save := podmanTest.Podman([]string{"save", "-o", outfile, BB})
+		save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, BB})
 		save.WaitWithDefaultTimeout()
 		Expect(save.ExitCode()).To(Equal(0))
 		session := SystemExec("xz", []string{outfile})
 		Expect(session.ExitCode()).To(Equal(0))
 
-		rmi := podmanTest.Podman([]string{"rmi", BB})
+		rmi := podmanTest.PodmanNoCache([]string{"rmi", BB})
 		rmi.WaitWithDefaultTimeout()
 		Expect(rmi.ExitCode()).To(Equal(0))
 
-		result := podmanTest.Podman([]string{"load", "-i", outfile + ".xz"})
+		result := podmanTest.PodmanNoCache([]string{"load", "-i", outfile + ".xz"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
 	})