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>
(cherry picked from commit 3262a69be6c582e4543199ddc54ebe2e306e3637)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/08/24 07:24:03Showing 3 changed files
| ... | ... |
@@ -257,13 +257,13 @@ pipeline {
|
| 257 | 257 |
run_tests() {
|
| 258 | 258 |
[ -n "$TESTDEBUG" ] && rm= || rm=--rm; |
| 259 | 259 |
docker run $rm -t --privileged \ |
| 260 |
- -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \ |
|
| 260 |
+ -v "$WORKSPACE/bundles/${TEST_INTEGRATION_DEST}:/go/src/github.com/docker/docker/bundles" \
|
|
| 261 |
+ -v "$WORKSPACE/bundles/dynbinary-daemon:/go/src/github.com/docker/docker/bundles/dynbinary-daemon" \ |
|
| 261 | 262 |
-v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \ |
| 262 | 263 |
--name "$CONTAINER_NAME" \ |
| 263 | 264 |
-e KEEPBUNDLE=1 \ |
| 264 | 265 |
-e TESTDEBUG \ |
| 265 | 266 |
-e TESTFLAGS \ |
| 266 |
- -e TEST_INTEGRATION_DEST \ |
|
| 267 | 267 |
-e TEST_SKIP_INTEGRATION \ |
| 268 | 268 |
-e TEST_SKIP_INTEGRATION_CLI \ |
| 269 | 269 |
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
|
| ... | ... |
@@ -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
|