diff --git a/Jenkinsfile b/Jenkinsfile index 29057e6c4b..d5f09816ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -268,13 +268,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