Remove unused gitlab ci env variables

diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index dbd399aaa5172a89981ca606e885dade2a3133bc..f85daf810b162161370eca0fb6dd485ef621a3cd 100755 (executable)
--- 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 caf09c01fdd41d23611ab402df8634c0c81cb0d3..6a73f461e2716bcc9afa5f54c7eb371c50ccb0e8 100644 (file)
--- 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 5bd5d5d8a96120b3e89f3e9336b961bac6fe1de7..e68812e1b4363df75b55e1d37021b26f8a638684 100644 (file)
--- 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, {