From 14d561eb1cdd4d7a0deeabb271406b7ddd9131a3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 24 Aug 2019 00:24:03 +0200 Subject: [PATCH] integration: simplify parallel run destination 'Namespace' parallel runs by bind-mounting a different directory in the container, instead of making the tests running inside the container aware of the namespaced location. This makes it transparent to the tests, and slightly reduces complexity. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3262a69be6c582e4543199ddc54ebe2e306e3637) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 4 ++-- Makefile | 1 - hack/make/test-integration | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26cc9e3524..245bb0d97c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -257,13 +257,13 @@ pipeline { run_tests() { [ -n "$TESTDEBUG" ] && rm= || rm=--rm; docker run $rm -t --privileged \ - -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \ + -v "$WORKSPACE/bundles/${TEST_INTEGRATION_DEST}:/go/src/github.com/docker/docker/bundles" \ + -v "$WORKSPACE/bundles/dynbinary-daemon:/go/src/github.com/docker/docker/bundles/dynbinary-daemon" \ -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \ --name "$CONTAINER_NAME" \ -e KEEPBUNDLE=1 \ -e TESTDEBUG \ -e TESTFLAGS \ - -e TEST_INTEGRATION_DEST \ -e TEST_SKIP_INTEGRATION \ -e TEST_SKIP_INTEGRATION_CLI \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \ diff --git a/Makefile b/Makefile index ed9372a16a..71f12d176e 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ DOCKER_ENVS := \ -e DOCKER_TEST_HOST \ -e DOCKER_USERLANDPROXY \ -e DOCKERD_ARGS \ - -e TEST_INTEGRATION_DEST \ -e TEST_INTEGRATION_DIR \ -e TEST_SKIP_INTEGRATION \ -e TEST_SKIP_INTEGRATION_CLI \ diff --git a/hack/make/test-integration b/hack/make/test-integration index 039afc9526..5ea41b0a32 100755 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -1,12 +1,6 @@ #!/usr/bin/env bash set -e -o pipefail -if [ -n "$TEST_INTEGRATION_DEST" ]; then - export DEST="$ABS_DEST/$TEST_INTEGRATION_DEST" - export DOCKER_INTEGRATION_DAEMON_DEST="$DEST" - mkdir -p "$DEST" -fi - source hack/make/.integration-test-helpers if [ ! -z "${TEST_SKIP_INTEGRATION}" ] && [ ! -z "${TEST_SKIP_INTEGRATION_CLI}" ]; then