summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-09-02 16:44:33 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2017-09-02 16:44:33 +0200
commitd8db70768c276235007e5c794f822db7403b6d30 (patch)
treeabcc2a344210c9def74b5a0e49c9cd3e3026a441
parent0099ff2cc63a5eeb523bb515a38bd9061e69d187 (diff)
downloadgitlab-d8db70768c276235007e5c794f822db7403b6d30.tar.gz
tests: faster docker shutdown
Kill the test container violently, no need to wait for a proper shutdown.
-rwxr-xr-xtools/build_test_env.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
index a3d4785..31651b3 100755
--- a/tools/build_test_env.sh
+++ b/tools/build_test_env.sh
@@ -64,18 +64,12 @@ CONFIG=/tmp/python-gitlab.cfg
cleanup() {
rm -f "${CONFIG}"
- log "Stopping gitlab-test docker container..."
- docker stop gitlab-test >/dev/null &
- docker_stop_pid=$!
- log "Waiting for gitlab-test docker container to exit..."
- docker wait gitlab-test >/dev/null
- wait "${docker_stop_pid}"
- log "Removing gitlab-test docker container..."
- docker rm gitlab-test >/dev/null
log "Deactivating Python virtualenv..."
command -v deactivate >/dev/null 2>&1 && deactivate || true
log "Deleting python virtualenv..."
rm -rf "$VENV"
+ log "Stopping gitlab-test docker container..."
+ docker rm -f gitlab-test >/dev/null
log "Done."
}
[ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] || {