From 9d31365d0a6ba142c30275b167c1f64472e348e1 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Thu, 23 Jun 2022 11:43:59 +0200 Subject: [PATCH] ci: tempoarily disable ui tests --- .gitlab-ci.yml | 136 +++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9baafe4b..18bf2ad3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,73 +63,75 @@ unit: paths: - coverage -.e2e-chrome: - image: cypress/browsers:node14.19.0-chrome100-ff99-edge - stage: test - script: - - npm run e2e -- --watch=false --headless=true --browser=chrome - artifacts: - when: on_failure - paths: - - cypress/videos - - cypress/screenshots - -.e2e-firefox: - image: cypress/browsers:node14.19.0-chrome100-ff99-edge - stage: test - script: - - npm run e2e -- --watch=false --headless=true --browser=firefox - artifacts: - when: on_failure - paths: - - cypress/videos - - cypress/screenshots - -ui-chrome: - extends: .e2e-chrome - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") - when: always - allow_failure: false - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") - when: never - -ui-firefox: - extends: .e2e-firefox - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") - when: always - allow_failure: false - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") - when: never - -e2e-chrome: - extends: .e2e-chrome - stage: ui test - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") - when: never - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") - when: manual - allow_failure: false - -e2e-firefox: - extends: .e2e-firefox - stage: ui test - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") - when: never - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") - when: manual - allow_failure: false +# Disabled until redesign is settled +# +# .e2e-chrome: +# image: cypress/browsers:node14.19.0-chrome100-ff99-edge +# stage: test +# script: +# - npm run e2e -- --watch=false --headless=true --browser=chrome +# artifacts: +# when: on_failure +# paths: +# - cypress/videos +# - cypress/screenshots +# +# .e2e-firefox: +# image: cypress/browsers:node14.19.0-chrome100-ff99-edge +# stage: test +# script: +# - npm run e2e -- --watch=false --headless=true --browser=firefox +# artifacts: +# when: on_failure +# paths: +# - cypress/videos +# - cypress/screenshots +# +# ui-chrome: +# extends: .e2e-chrome +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# when: never +# - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") +# when: always +# allow_failure: false +# - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") +# when: never +# +# ui-firefox: +# extends: .e2e-firefox +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# when: never +# - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") +# when: always +# allow_failure: false +# - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") +# when: never +# +# e2e-chrome: +# extends: .e2e-chrome +# stage: ui test +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# when: never +# - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") +# when: never +# - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") +# when: manual +# allow_failure: false +# +# e2e-firefox: +# extends: .e2e-firefox +# stage: ui test +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# when: never +# - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") +# when: never +# - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") +# when: manual +# allow_failure: false audit: stage: test