From 715785950c3388d54b4a9b81e71d311883be2c5a Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 5 May 2017 14:49:02 +0200 Subject: [PATCH] test: use redis:alpine Signed-off-by: Antonio Murdaca --- test/helpers.bash | 10 +++++----- test/testdata/container_config.json | 2 +- test/testdata/container_config_by_imageid.json | 4 +--- test/testdata/container_config_seccomp.json | 2 +- test/testdata/container_redis.json | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/test/helpers.bash b/test/helpers.bash index 722e1dee..7844916b 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -68,7 +68,7 @@ PATH=$PATH:$TESTDIR # Make sure we have a copy of the redis:latest image. if ! [ -d "$ARTIFACTS_PATH"/redis-image ]; then mkdir -p "$ARTIFACTS_PATH"/redis-image - if ! "$COPYIMG_BINARY" --import-from=docker://redis --export-to=dir:"$ARTIFACTS_PATH"/redis-image --signature-policy="$INTEGRATION_ROOT"/policy.json ; then + if ! "$COPYIMG_BINARY" --import-from=docker://redis:alpine --export-to=dir:"$ARTIFACTS_PATH"/redis-image --signature-policy="$INTEGRATION_ROOT"/policy.json ; then echo "Error pulling docker://redis" rm -fr "$ARTIFACTS_PATH"/redis-image exit 1 @@ -145,7 +145,7 @@ function start_ocid() { if ! [ "$3" = "--no-pause-image" ] ; then "$BIN2IMG_BINARY" --root "$TESTDIR/ocid" $STORAGE_OPTS --runroot "$TESTDIR/ocid-run" --source-binary "$PAUSE_BINARY" fi - "$COPYIMG_BINARY" --root "$TESTDIR/ocid" $STORAGE_OPTS --runroot "$TESTDIR/ocid-run" --image-name=redis --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:latest --signature-policy="$INTEGRATION_ROOT"/policy.json + "$COPYIMG_BINARY" --root "$TESTDIR/ocid" $STORAGE_OPTS --runroot "$TESTDIR/ocid-run" --image-name=redis:alpine --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:alpine --signature-policy="$INTEGRATION_ROOT"/policy.json "$OCID_BINARY" --conmon "$CONMON_BINARY" --listen "$OCID_SOCKET" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/ocid" --runroot "$TESTDIR/ocid-run" $STORAGE_OPTS --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$OCID_CNI_CONFIG" --signature-policy "$INTEGRATION_ROOT"/policy.json --config /dev/null config >$OCID_CONFIG # Prepare the CNI configuration files, we're running with non host networking by default @@ -154,11 +154,11 @@ function start_ocid() { "$OCID_BINARY" --debug --config "$OCID_CONFIG" & OCID_PID=$! wait_until_reachable - run ocic image status --id=redis + run ocic image status --id=redis:alpine if [ "$status" -ne 0 ] ; then - ocic image pull redis:latest + ocic image pull redis:alpine fi - REDIS_IMAGEID=$(ocic image status --id=redis | head -1 | sed -e "s/ID: //g") + REDIS_IMAGEID=$(ocic image status --id=redis:alpine | head -1 | sed -e "s/ID: //g") run ocic image status --id=busybox if [ "$status" -ne 0 ] ; then ocic image pull busybox:latest diff --git a/test/testdata/container_config.json b/test/testdata/container_config.json index 3ab8fb8d..9b09a0d5 100644 --- a/test/testdata/container_config.json +++ b/test/testdata/container_config.json @@ -4,7 +4,7 @@ "attempt": 1 }, "image": { - "image": "docker://redis:latest" + "image": "redis:alpine" }, "command": [ "/bin/ls" diff --git a/test/testdata/container_config_by_imageid.json b/test/testdata/container_config_by_imageid.json index 5c87e7a5..1062c7e2 100644 --- a/test/testdata/container_config_by_imageid.json +++ b/test/testdata/container_config_by_imageid.json @@ -7,11 +7,9 @@ "image": "%VALUE%" }, "command": [ - "/bin/bash" - ], - "args": [ "/bin/ls" ], + "args": [], "working_dir": "/", "envs": [ { diff --git a/test/testdata/container_config_seccomp.json b/test/testdata/container_config_seccomp.json index 027c25e1..948944b0 100644 --- a/test/testdata/container_config_seccomp.json +++ b/test/testdata/container_config_seccomp.json @@ -4,7 +4,7 @@ "attempt": 1 }, "image": { - "image": "docker://redis:latest" + "image": "redis:alpine" }, "command": [ "/bin/bash" diff --git a/test/testdata/container_redis.json b/test/testdata/container_redis.json index 839ca746..96a22ac9 100644 --- a/test/testdata/container_redis.json +++ b/test/testdata/container_redis.json @@ -3,7 +3,7 @@ "name": "podsandbox1-redis" }, "image": { - "image": "docker://redis:latest" + "image": "redis:alpine" }, "args": [ "docker-entrypoint.sh",