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

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

Browse Source 
tests.sh: remove integration/ support

OBS-URL: https://build.opensuse.org/request/show/683820
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=298
This commit is contained in:
Aleksa Sarai 2019-03-11 12:02:19 +00:00 committed by Git OBS Bridge
parent 46a92a1eb8
commit 1dba49a151
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker.changes
View File

@ -4,7 +4,6 @@ Sun Mar 10 21:12:09 UTC 2019 - Aleksa Sarai <asarai@suse.com>
- docker-test: improvements to test packaging (we don't need to ship around the - docker-test: improvements to test packaging (we don't need to ship around the
entire source tree, and we also need to build the born-again integration/ entire source tree, and we also need to build the born-again integration/
tests which contain a suite-per-directory). tests which contain a suite-per-directory).
- docker-test: add support for running the new integration/ tests with tests.sh
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 26 09:39:57 UTC 2019 - Michal Jura <mjura@suse.com> Tue Feb 26 09:39:57 UTC 2019 - Michal Jura <mjura@suse.com>

5
tests.sh
View File

@ -8,7 +8,6 @@ set -Eeuo pipefail
DOCKER_DIR=/usr/src/docker DOCKER_DIR=/usr/src/docker
SCRIPTS_DIR="$DOCKER_DIR/hack" SCRIPTS_DIR="$DOCKER_DIR/hack"
TESTS_EXE="$DOCKER_DIR/integration-cli/tests.main"
VERSION="$(cat "$DOCKER_DIR/VERSION")" VERSION="$(cat "$DOCKER_DIR/VERSION")"
# working dirs # working dirs
@ -17,7 +16,7 @@ FROZEN_IMAGES_DIR="$TEST_TMPDIR/frozen-images"
FROZEN_IMAGES_LINK=/docker-frozen-images FROZEN_IMAGES_LINK=/docker-frozen-images
BUNDLES_DIR="$TEST_TMPDIR/run/bundles" BUNDLES_DIR="$TEST_TMPDIR/run/bundles"
readarray -t TESTS < <(find "$DOCKER_DIR" -type f -executable -name 'tests.main') readarray -t TESTS < <(find "$DOCKER_DIR/integration-cli" -type f -executable -name 'tests.main')
CHECK_TIMEOUT="${CHECK_TIMEOUT:-15m}" CHECK_TIMEOUT="${CHECK_TIMEOUT:-15m}"
TEST_TIMEOUT="${TEST_TIMEOUT:-6h}" 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}")
@ -87,7 +86,7 @@ require_git() { git version >/dev/null 2>&1 ; }
################################################################################ ################################################################################
[ "${#TESTS[@]}" -eq 0 ] || abort "integration tests executable not found at $TESTS_EXE" [ "${#TESTS[@]}" -eq 0 ] || abort "integration tests executable not found in $DOCKER_DIR"
[ "$EUID" -eq 0 ] || abort "this script must be run as root" [ "$EUID" -eq 0 ] || abort "this script must be run as root"
[ -n "$VERSION" ] || abort "could not obtain version" [ -n "$VERSION" ] || abort "could not obtain version"