summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNejc Habjan <hab.nejc@gmail.com>2020-02-20 00:40:44 +0100
committerNejc Habjan <hab.nejc@gmail.com>2020-02-20 00:40:44 +0100
commit3834d9cf800a0659433eb640cb3b63a947f0ebda (patch)
tree5f9f3cba527b40954db324d8a10854652282a80a /tools
parent19242c398b9074e04e35cc687c31c543a10db280 (diff)
downloadgitlab-3834d9cf800a0659433eb640cb3b63a947f0ebda.tar.gz
perf: prepare environment when gitlab is reconfigured
Diffstat (limited to 'tools')
-rwxr-xr-xtools/build_test_env.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
index f5feebf..7a3fc23 100755
--- a/tools/build_test_env.sh
+++ b/tools/build_test_env.sh
@@ -141,20 +141,13 @@ while :; do
sleep 1
docker top gitlab-test >/dev/null 2>&1 || fatal "docker failed to start"
sleep 4
- # last command started by the container is "gitlab-ctl tail"
- docker exec gitlab-test pgrep -f 'gitlab-ctl tail' &>/dev/null \
- && docker exec gitlab-test curl http://localhost/-/health 2>/dev/null \
- | grep -q 'GitLab OK' \
- && curl -s http://localhost:8080/users/sign_in 2>/dev/null \
- | grep -q "GitLab Community Edition" \
+ docker logs gitlab-test 2>&1 | grep "gitlab Reconfigured!" \
&& break
I=$((I+5))
+ log "Waiting for GitLab to reconfigure.. (${I}s)"
[ "$I" -lt 180 ] || fatal "timed out"
done
-log "Pausing to give GitLab some time to finish starting up..."
-sleep 200
-
# Get the token
TOKEN=$($(dirname $0)/generate_token.py)