diff options
author | baude <bbaude@redhat.com> | 2020-10-27 09:14:53 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2020-11-16 08:15:44 -0600 |
commit | 15539c1c4bdb10095bb4d30c6283795dac657600 (patch) | |
tree | 6a0090d6ab89eb7665067ce32194f45b9dfe38da /test/e2e/run_test.go | |
parent | 392075631a284617b7e37b8bdfb3157f5918cdec (diff) | |
download | podman-15539c1c4bdb10095bb4d30c6283795dac657600.tar.gz podman-15539c1c4bdb10095bb4d30c6283795dac657600.tar.bz2 podman-15539c1c4bdb10095bb4d30c6283795dac657600.zip |
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>
Diffstat (limited to 'test/e2e/run_test.go')
-rw-r--r-- | test/e2e/run_test.go | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index deb4419af..5ee85efb9 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -572,12 +572,12 @@ USER bin` }) It("podman run tagged image", func() { - podmanTest.RestoreArtifact(BB) - tag := podmanTest.PodmanNoCache([]string{"tag", "busybox", "bb"}) + podmanTest.AddImageToRWStore(BB) + tag := podmanTest.Podman([]string{"tag", BB, "bb"}) tag.WaitWithDefaultTimeout() Expect(tag.ExitCode()).To(Equal(0)) - session := podmanTest.PodmanNoCache([]string{"run", "--rm", "bb", "ls"}) + session := podmanTest.Podman([]string{"run", "--rm", "bb", "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) @@ -1339,42 +1339,30 @@ WORKDIR /madethis` }) It("podman run a container with --pull never should fail if no local store", func() { - // Make sure ALPINE image does not exist. Ignore errors - session := podmanTest.PodmanNoCache([]string{"rmi", "--force", "never", ALPINE}) - session.WaitWithDefaultTimeout() - - session = podmanTest.PodmanNoCache([]string{"run", "--pull", "never", ALPINE, "ls"}) + session := podmanTest.Podman([]string{"run", "--pull", "never", "docker.io/library/debian:latest", "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(125)) }) It("podman run container with --pull missing and only pull once", func() { - // Make sure ALPINE image does not exist. Ignore errors - session := podmanTest.PodmanNoCache([]string{"rmi", "--force", "never", ALPINE}) - session.WaitWithDefaultTimeout() - - session = podmanTest.PodmanNoCache([]string{"run", "--pull", "missing", ALPINE, "ls"}) + session := podmanTest.Podman([]string{"run", "--pull", "missing", cirros, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull")) - session = podmanTest.PodmanNoCache([]string{"run", "--pull", "missing", ALPINE, "ls"}) + session = podmanTest.Podman([]string{"run", "--pull", "missing", cirros, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.ErrorToString()).ToNot(ContainSubstring("Trying to pull")) }) It("podman run container with --pull missing should pull image multiple times", func() { - // Make sure ALPINE image does not exist. Ignore errors - session := podmanTest.PodmanNoCache([]string{"rmi", "--force", "never", ALPINE}) - session.WaitWithDefaultTimeout() - - session = podmanTest.PodmanNoCache([]string{"run", "--pull", "always", ALPINE, "ls"}) + session := podmanTest.Podman([]string{"run", "--pull", "always", cirros, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull")) - session = podmanTest.PodmanNoCache([]string{"run", "--pull", "always", ALPINE, "ls"}) + session = podmanTest.Podman([]string{"run", "--pull", "always", cirros, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("Trying to pull")) |