Use cached images for integration tests

Add alpine and busybox as the two seeded images that can
be put into the tests' storage without the need to pull
it over the network.  Add the following to the kpod_TEST.bats
file:

function setup() {
    copy_images
}

Also, export several image names for shorter reference:

* BB -> docker.io/library/busybox:latest
* BB_GLIBC -> docker.io/library/busybox:glibc
* ALPINE -> docker.io/library/alpine:latest
* FEDORA_MINIMAL -> registry.fedoraproject.org/fedora-minimal:latest

And finally, there were two pervasive changes I made in
tests:

* Because we use temporary storage, we do not need to rmi at the end of each test
* We no longer need to pull most images because they are added via copy_images

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

Closes: #43
Approved by: mheon

1 files changed, 14 insertions, 18 deletions

diff --git a/test/kpod_push.bats b/test/kpod_push.bats
index f40fc7b30..15672ba82 100644
--- a/test/kpod_push.bats
+++ b/test/kpod_push.bats
@@ -2,22 +2,22 @@
 
 load helpers
 
-IMAGE="alpine:latest"
-
 function teardown() {
     cleanup_test
 }
 
+function setup() {
+    copy_images
+}
+
 @test "kpod push to containers/storage" {
     skip "Issues with bash, skipping"
-    echo # Pull down the image: it gets the name $IMAGE.
-    ${KPOD_BINARY} $KPOD_OPTIONS --log-level=debug pull $IMAGE
     echo # Push the image right back into storage: it now has two names.
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS --log-level=debug push "$IMAGE" containers-storage:busybox:test
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS --log-level=debug push $ALPINE containers-storage:busybox:test
     echo "$output"
     [ "$status" -eq 0 ]
     echo # Try to remove it using the first name.  Should be refused.
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS --log-level=debug rmi $IMAGE
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS --log-level=debug rmi $ALPINE
     echo "$output"
     [ "$status" -ne 0 ]
     echo # Try to remove it using the second name.  Should also be refused.
@@ -31,48 +31,44 @@ function teardown() {
 }
 
 @test "kpod push to directory" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
     mkdir /tmp/busybox
-    run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" dir:/tmp/busybox
+    run ${KPOD_BINARY} $KPOD_OPTIONS push $ALPINE dir:/tmp/busybox
     echo "$output"
     [ "$status" -eq 0 ]
     rm -rf /tmp/busybox
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE"
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "kpod push to docker archive" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
-    run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" docker-archive:/tmp/busybox-archive:1.26
+    run ${KPOD_BINARY} $KPOD_OPTIONS push $ALPINE docker-archive:/tmp/busybox-archive:1.26
     echo "$output"
     echo "--->"
     [ "$status" -eq 0 ]
     rm /tmp/busybox-archive
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE"
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "kpod push to oci-archive without compression" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
-    run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" oci-archive:/tmp/oci-busybox.tar:alpine
+    run ${KPOD_BINARY} $KPOD_OPTIONS push $ALPINE oci-archive:/tmp/oci-busybox.tar:alpine
     echo "$output"
     [ "$status" -eq 0 ]
     rm -f /tmp/oci-busybox.tar
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE"
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }
 
 @test "kpod push without signatures" {
-    ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
     mkdir /tmp/busybox
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS push --remove-signatures "$IMAGE" dir:/tmp/busybox
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS push --remove-signatures $ALPINE dir:/tmp/busybox
     echo "$output"
     [ "$status" -eq 0 ]
     rm -rf /tmp/busybox
-    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE"
+    run bash -c ${KPOD_BINARY} $KPOD_OPTIONS rmi $ALPINE
     echo "$output"
     [ "$status" -eq 0 ]
 }