From ee90f1bc19c4a62f34f7a329596d613aa931d8a8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 24 Aug 2020 16:35:01 +0200 Subject: [PATCH] Remove unused gitlab ci env variables --- scripts/clean/server/test.sh | 4 ---- shared/extra-utils/miscs/miscs.ts | 2 -- shared/extra-utils/miscs/sql.ts | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh index dbd399aaa..f85daf810 100755 --- a/scripts/clean/server/test.sh +++ b/scripts/clean/server/test.sh @@ -20,10 +20,6 @@ dropRedis () { port=$((9000+$1)) host="localhost" - 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 diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts index caf09c01f..6a73f461e 100644 --- a/shared/extra-utils/miscs/miscs.ts +++ b/shared/extra-utils/miscs/miscs.ts @@ -67,8 +67,6 @@ function buildAbsoluteFixturePath (path: string, customCIPath = false) { if (isAbsolute(path)) return path if (customCIPath) { - if (process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path) - return join(process.env.HOME, 'fixtures', path) } diff --git a/shared/extra-utils/miscs/sql.ts b/shared/extra-utils/miscs/sql.ts index 5bd5d5d8a..e68812e1b 100644 --- a/shared/extra-utils/miscs/sql.ts +++ b/shared/extra-utils/miscs/sql.ts @@ -9,7 +9,7 @@ function getSequelize (internalServerNumber: number) { const dbname = 'peertube_test' + internalServerNumber const username = 'peertube' const password = 'peertube' - const host = process.env.GITLAB_CI ? 'postgres' : 'localhost' + const host = 'localhost' const port = 5432 const seq = new Sequelize(dbname, username, password, { -- 2.41.0