pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 683712 from home:cyphar:containers:docker-test

Browse Source 
More improvements to tests.sh.

OBS-URL: https://build.opensuse.org/request/show/683712
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=295
This commit is contained in:
Aleksa Sarai 2019-03-11 08:08:10 +00:00 committed by Git OBS Bridge
parent 2da3bd4f57
commit b94112cc9d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests.sh
View File

@ -13,11 +13,12 @@ VERSION="$(cat "$DOCKER_DIR/VERSION")"
# working dirs # working dirs
TESTS_DIR=/tmp/docker-int-tests TESTS_DIR=/tmp/docker-int-tests
FROZEN_IMAGES=/docker-frozen-images FROZEN_IMAGES_DIR="$TESTS_DIR/frozen-images"
FROZEN_IMAGES_LINK=/docker-frozen-images
BUNDLES_DIR="$TESTS_DIR/run/bundles" BUNDLES_DIR="$TESTS_DIR/run/bundles"
CHECK_TIMEOUT="${CHECK_TIMEOUT:-5m}" CHECK_TIMEOUT="${CHECK_TIMEOUT:-15m}"
TEST_TIMEOUT="${TEST_TIMEOUT:-60m}" TEST_TIMEOUT="${TEST_TIMEOUT:-6h}"
TEST_ARGS=("-check.v" "-check.timeout=${CHECK_TIMEOUT}" "-test.timeout=${TEST_TIMEOUT}") TEST_ARGS=("-check.v" "-check.timeout=${CHECK_TIMEOUT}" "-test.timeout=${TEST_TIMEOUT}")
TEST_SELECT= TEST_SELECT=
TEST_LOG=/tmp/docker-tests.log TEST_LOG=/tmp/docker-tests.log
@ -191,8 +192,7 @@ cleanup() {
log "Removing extra files and restoring backups..." log "Removing extra files and restoring backups..."
restore_backup /etc/subuid /etc/subgid restore_backup /etc/subuid /etc/subgid
rm -f "$TESTS_DIR/contrib" "$DEST/fixtures" rm -f "$TESTS_DIR/contrib" "$DEST/fixtures" "$FROZEN_IMAGES_LINK"
rm -rf "$FROZEN_IMAGES"
} }
trap cleanup EXIT trap cleanup EXIT
@ -206,8 +206,9 @@ bundle .integration-daemon-setup
# XXX: Really this should be sourced from the Dockerfile but this is good # XXX: Really this should be sourced from the Dockerfile but this is good
# enough for now. This comes from the Docker 18.09.1-ce Dockerfile. # enough for now. This comes from the Docker 18.09.1-ce Dockerfile.
log "Downlading frozen images..." log "Downlading frozen images..."
mkdir -p "$FROZEN_IMAGES" mkdir -p "$FROZEN_IMAGES_DIR"
"$DOCKER_DIR/contrib/download-frozen-image-v2.sh" "$FROZEN_IMAGES" \ ln -sf "$FROZEN_IMAGES_DIR" "$FROZEN_IMAGES_LINK"
"$DOCKER_DIR/contrib/download-frozen-image-v2.sh" "$FROZEN_IMAGES_DIR" \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \ busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \