From 2284f202070aa2e49156cc52b3b1596a7d5aadec Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 29 Jul 2019 11:59:29 +0200 Subject: Add gitlab ci support --- scripts/clean/server/test.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'scripts/clean/server') diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh index 20745170d..dbd399aaa 100755 --- a/scripts/clean/server/test.sh +++ b/scripts/clean/server/test.sh @@ -5,7 +5,7 @@ set -eu recreateDB () { dbname="peertube_test$1" - dropdb --if-exists "$dbname" + dropdb --if-exists "$dbname" 2>&1 createdb -O peertube "$dbname" psql -c "CREATE EXTENSION pg_trgm;" "$dbname" & @@ -18,10 +18,15 @@ removeFiles () { dropRedis () { port=$((9000+$1)) + host="localhost" - redis-cli KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL - redis-cli KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL - redis-cli KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli DEL + if [ ! -z ${GITLAB_CI+x} ]; then + host="redis" + fi + + redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL + redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL + redis-cli -h "$host" KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL } seq=$(seq 1 6) -- cgit v1.2.3