aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xscripts/clean/server/test.sh4
-rw-r--r--shared/extra-utils/miscs/miscs.ts2
-rw-r--r--shared/extra-utils/miscs/sql.ts2
3 files changed, 1 insertions, 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 () {
20 port=$((9000+$1)) 20 port=$((9000+$1))
21 host="localhost" 21 host="localhost"
22 22
23 if [ ! -z ${GITLAB_CI+x} ]; then
24 host="redis"
25 fi
26
27 redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL 23 redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
28 redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL 24 redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
29 redis-cli -h "$host" KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL 25 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) {
67 if (isAbsolute(path)) return path 67 if (isAbsolute(path)) return path
68 68
69 if (customCIPath) { 69 if (customCIPath) {
70 if (process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path)
71
72 return join(process.env.HOME, 'fixtures', path) 70 return join(process.env.HOME, 'fixtures', path)
73 } 71 }
74 72
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) {
9 const dbname = 'peertube_test' + internalServerNumber 9 const dbname = 'peertube_test' + internalServerNumber
10 const username = 'peertube' 10 const username = 'peertube'
11 const password = 'peertube' 11 const password = 'peertube'
12 const host = process.env.GITLAB_CI ? 'postgres' : 'localhost' 12 const host = 'localhost'
13 const port = 5432 13 const port = 5432
14 14
15 const seq = new Sequelize(dbname, username, password, { 15 const seq = new Sequelize(dbname, username, password, {