From 671ddc8febb9682a18ffb51eaa80c853720a9d4b Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 1 May 2015 21:35:58 -0700 Subject: [PATCH] integration tests: run with native/vfs by default. Signed-off-by: Andrea Luzzardi --- test/integration/helpers.bash | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index c2ba3dd5b1..47209fce5d 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -16,6 +16,10 @@ SWARM_HOST=127.0.0.1:$(( ( RANDOM % 1000 ) + 6000 )) # Use a random base port (for engines) between 5000 and 6000. BASE_PORT=$(( ( RANDOM % 1000 ) + 5000 )) +# Drivers to use for Docker engines the tests are going to create. +STORAGE_DRIVER=${STORAGE_DRIVER:-vfs} +EXEC_DRIVER=${EXEC_DRIVER:-native} + # Join an array with a given separator. function join() { local IFS="$1" @@ -136,7 +140,12 @@ function start_docker() { for ((i=current; i < (current + instances); i++)); do local port=$(($BASE_PORT + $i)) HOSTS[$i]=127.0.0.1:$port - DOCKER_CONTAINERS[$i]=$(docker run -d --name node-$i -h node-$i --privileged -p 127.0.0.1:$port:$port -it ${DOCKER_IMAGE}:${DOCKER_VERSION} docker -d -H 0.0.0.0:$port "$@") + DOCKER_CONTAINERS[$i]=$(docker run -d --name node-$i -h node-$i --privileged \ + -p 127.0.0.1:$port:$port -it \ + ${DOCKER_IMAGE}:${DOCKER_VERSION} \ + docker -d -H 0.0.0.0:$port \ + --storage-driver=$STORAGE_DRIVER --exec-driver=$EXEC_DRIVER \ + "$@") done # Wait for the engines to be reachable.