From 97d185fdcad49e6ff5f1abaefe47d5126a2433ec Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 25 May 2021 15:49:12 +0200
Subject: [PATCH] CI: move to multi project pipelines for e2e tests
---
.gitlab-ci.yml | 55 +++++++-------------------------------------------
1 file changed, 7 insertions(+), 48 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a9ce16..c4cbcbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,11 @@ before_script:
- git submodule sync
- git submodule update --init
- yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache"
- - export CYPRESS_CACHE_FOLDER="$CI_PROJECT_DIR/_cypress_cache"
stages:
- test
- deploy
- - e2e-stage1
- - e2e-stage2
- - e2e-stage3
+ - e2e
test:
stage: test
@@ -99,51 +96,13 @@ deploy_production:
DEPLOY_KEY: "$DEPLOY_SSH_KEY"
<<: *deploy_defaults
-# For docker images see:
-# https://github.com/cypress-io/cypress-docker-images/tree/master/browsers#cypressbrowsers
-
-.e2e_test_defaults: &e2e_test_defaults
+e2e_tests:
only:
refs:
- master
- # We don't need artifacts from previous runs
- dependencies: []
- script:
- - git clone https://gitlab.tugraz.at/dbp/middleware/e2e-tests.git --depth 1
- - cd e2e-tests
- - yarn install
-# - ./node_modules/.bin/cypress run --browser "$BROWSER" --spec "cypress/integration/signature/*.spec.js"
- - xvfb-run ./node_modules/.bin/cypress run --browser "$BROWSER" --headed --spec "cypress/integration/signature/*.spec.js"
- cache:
- key: $CI_PROJECT_PATH-cypress
- paths:
- - _cypress_cache
- - _yarn_cache
- artifacts:
- paths:
- - e2e-tests/cypress/videos/*
- - e2e-tests/cypress/screenshots/*
- expire_in: 4 week
- when: always
-
-ff75:
- image: cypress/browsers:node13.8.0-chrome81-ff75
- stage: e2e-stage1
- variables:
- MOZ_FORCE_DISABLE_E10S: 'true'
- BROWSER: 'firefox'
- <<: *e2e_test_defaults
-
-chrome84:
- image: cypress/browsers:node14.7.0-chrome84
- stage: e2e-stage2
- variables:
- BROWSER: 'chrome'
- <<: *e2e_test_defaults
-
-edge88:
- image: cypress/browsers:node14.10.1-edge88
- stage: e2e-stage3
variables:
- BROWSER: 'edge'
- <<: *e2e_test_defaults
+ E2E_PROJECT: signature
+ stage: e2e
+ trigger:
+ project: dbp/e2e-tests
+ strategy: depend
--
GitLab