add docker rm flag so circleci can disable deletion of containers

pull/5517/head
Nathaniel Cook 2016-02-02 13:46:13 -07:00
parent 1c19320e79
commit df6d97a6a5
2 changed files with 6 additions and 1 deletions

View File

@ -10,6 +10,8 @@ DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
cd $DIR
export OUTPUT_DIR="$CIRCLE_ARTIFACTS"
# Don't delete the container since CircleCI doesn't have permission to do so.
export DOCKER_RM="false"
# Get number of test environments.
count=$(./test.sh count)

View File

@ -32,6 +32,9 @@ PARALLELISM=${PARALLELISM-1}
# Set default timeout
TIMEOUT=${TIMEOUT-480s}
# Default to deleteing the container
DOCKER_RM=${DOCKER_RM-true}
# Update this value if you add a new test environment.
ENV_COUNT=6
@ -69,7 +72,7 @@ function run_test_docker {
echo "Running test in docker $name with args $@"
docker run \
--rm \
--rm=$DOCKER_RM \
-v "$DIR:/root/go/src/github.com/influxdb/influxdb" \
-e "INFLUXDB_DATA_ENGINE=$INFLUXDB_DATA_ENGINE" \
-e "GORACE=$GORACE" \