From 12e8547f07d9ef28ede3141da11c8c3de8549f7e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 30 Jul 2020 16:25:00 +0200 Subject: [PATCH] Test ldap --- .github/workflows/test.yml | 10 +++--- .gitlab-ci.yml | 73 -------------------------------------- scripts/ci.sh | 2 +- 3 files changed, 7 insertions(+), 78 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b9119e2a..9c90e6437 100644 --- 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 8deb07694..3891187e8 100644 --- 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 bf34cd337..df9d6d2b2 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -eu