1. docker
  2. Commit 3262a69be6c582e4543199ddc54ebe2e306e3637
Browse code

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 <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/24 07:24:03
Showing 3 changed files
Jenkinsfile
History View file @ 3262a69
... ... 
@@ -268,13 +268,13 @@ pipeline {
268 268 
                                 run_tests() {
269 269 
                                         [ -n "$TESTDEBUG" ] && rm= || rm=--rm;
270 270 
                                         docker run $rm -t --privileged \
271 
-                                          -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
271 
+                                          -v "$WORKSPACE/bundles/${TEST_INTEGRATION_DEST}:/go/src/github.com/docker/docker/bundles" \
272 
+                                          -v "$WORKSPACE/bundles/dynbinary-daemon:/go/src/github.com/docker/docker/bundles/dynbinary-daemon" \
272 273 
                                           -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
273 274 
                                           --name "$CONTAINER_NAME" \
274 275 
                                           -e KEEPBUNDLE=1 \
275 276 
                                           -e TESTDEBUG \
276 277 
                                           -e TESTFLAGS \
277 
-                                          -e TEST_INTEGRATION_DEST \
278 278 
                                           -e TEST_SKIP_INTEGRATION \
279 279 
                                           -e TEST_SKIP_INTEGRATION_CLI \
280 280 
                                           -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
Makefile
History View file @ 3262a69
... ... 
@@ -53,7 +53,6 @@ DOCKER_ENVS := \
53 53 
 	-e DOCKER_TEST_HOST \
54 54 
 	-e DOCKER_USERLANDPROXY \
55 55 
 	-e DOCKERD_ARGS \
56 
-	-e TEST_INTEGRATION_DEST \
57 56 
 	-e TEST_INTEGRATION_DIR \
58 57 
 	-e TEST_SKIP_INTEGRATION \
59 58 
 	-e TEST_SKIP_INTEGRATION_CLI \
hack/make/test-integration
History View file @ 3262a69
... ... 
@@ -1,12 +1,6 @@
1 1 
 #!/usr/bin/env bash
2 2 
 set -e -o pipefail
3 3
4 
-if [ -n "$TEST_INTEGRATION_DEST" ]; then
5 
-	export DEST="$ABS_DEST/$TEST_INTEGRATION_DEST"
6 
-	export DOCKER_INTEGRATION_DAEMON_DEST="$DEST"
7 
-	mkdir -p "$DEST"
8 
-fi
9 
-
10 4 
 source hack/make/.integration-test-helpers
11 5
12 6 
 if [ ! -z "${TEST_SKIP_INTEGRATION}" ] && [ ! -z "${TEST_SKIP_INTEGRATION_CLI}" ]; then