Test ldap

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b9119e2a84a6c1655fcca99b1cf295124785382..9c90e64379b9b516da292838884bdfb874fcff3f 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,10 +21,15 @@ jobs:
           POSTGRES_USER: peertube
           POSTGRES_HOST_AUTH_METHOD: trust
 
+      ldap:
+        image: rroemhild/test-openldap
+        ports:
+          - 389:389
+
     strategy:
       fail-fast: false
       matrix:
-        test_suite: [ misc, api-1, api-2, api-3, api-4, cli, lint ]
+        test_suite: [ misc, api-1, api-2, api-3, api-4, cli, lint, external-plugins ]
 
     env:
       PGUSER: peertube
@@ -63,9 +68,6 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Test
-        run: echo $PATH
-
       - name: Run Test
         run: NODE_PENDING_JOB_WAIT=2000 npm run ci -- ${{ matrix.test_suite }}
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8deb0769484931b23f8acf6bd959f666c68a6821..3891187e86bf33d528a26e3602abe78f3d7d149e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,85 +7,12 @@ stages:
   - docker-nightly
   - external-plugins
 
-#before_script:
-#  - 'sed -i -z "s/database:\n  hostname: ''localhost''/database:\n  hostname: ''postgres''/" config/test.yaml'
-#  - 'sed -i -z "s/redis:\n  hostname: ''localhost''/redis:\n  hostname: ''redis''/" config/test.yaml'
-#  - if [[ $CI_JOB_STAGE == "test" ]]; then psql -c "create user peertube with password 'peertube';"; fi
-#  - NOCLIENT=1 yarn install --pure-lockfile --cache-folder .yarn-cache
-
 cache:
   key: yarn
   paths:
     - .yarn-cache
     - cached-fixtures
 
-###
-## Jobs templates
-#
-#.build-and-lint: &build-and-lint
-#  stage: build-and-lint
-#
-#.tests: &tests
-#  stage: test
-#  dependencies:
-#    - build-server
-#  services:
-#    - name: postgres:9.6
-#      alias: postgres
-#    - name: redis:latest
-#      alias: redis
-#  variables:
-#    PGHOST: postgres
-#    PGUSER: postgres
-#    REDIS_HOST: redis
-#  artifacts:
-#    expire_in: 1 day
-#    paths:
-#      - test*/logs
-#    when: always
-#
-####
-### Build and lint
-##
-#build-server:
-#  <<: *build-and-lint
-#  artifacts:
-#    expire_in: 5h
-#    paths:
-#      - dist/
-#  script:
-#    - npm run build:server
-#
-#lint:
-#  <<: *build-and-lint
-#  script:
-#    - yarn install --pure-lockfile --cache-folder .yarn-cache
-#    - npm run ci -- "lint"
-#
-####
-### Tests
-#
-#test-misc:
-#  <<: *tests
-#  script:
-#    - yarn install --pure-lockfile --cache-folder .yarn-cache
-#    - npm run ci -- "misc"
-#
-#test-cli:
-#  <<: *tests
-#  retry:
-#    max: 1
-#  script:
-#    - npm run ci -- "cli"
-#
-#api:
-#  <<: *tests
-#  parallel: 4
-#  retry:
-#    max: 1
-#  script:
-#    - NODE_PENDING_JOB_WAIT=1000 npm run ci -- api-$CI_NODE_INDEX
-
 build-openapi-clients:
   stage: clients
   only:

diff --git a/scripts/ci.sh b/scripts/ci.sh
index bf34cd3373e956ba0efc6937cc48991dba02d0b2..df9d6d2b214cde8b8cad0505ec589fa325d5251e 100755 (executable)
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu