Skip to content
Snippets Groups Projects
Commit 291d27ea authored by Otto Visser's avatar Otto Visser
Browse files

Merge branch 'ciFix' into 'development'

Disable performance due to DinD issues

See merge request !72
parents 9e2694f3 faddf38c
2 merge requests!73Development,!72Disable performance due to DinD issues
......@@ -187,7 +187,7 @@ include:
- template: Security/License-Scanning.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml
- template: Verify/Accessibility.gitlab-ci.yml
- template: Verify/Browser-Performance.gitlab-ci.yml
# - template: Verify/Browser-Performance.gitlab-ci.yml
# Runs the code quality reporter
......@@ -247,19 +247,19 @@ a11y:
ally_urls: "https://submit.tudelft.nl"
# Accessibility testing
performance:
extends:
- .gitlab_reporter
rules:
- if: $CI_PIPELINE_SOURCE == "trigger" ||
$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
when: never
- if: $CI_COMMIT_BRANCH == "master" ||
$CI_COMMIT_BRANCH == "development"
when: manual
stage: gitlab reports
variables:
URL: "https://submit.tudelft.nl"
#performance:
# extends:
# - .gitlab_reporter
# rules:
# - if: $CI_PIPELINE_SOURCE == "trigger" ||
# $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
# when: never
# - if: $CI_COMMIT_BRANCH == "master" ||
# $CI_COMMIT_BRANCH == "development"
# when: manual
# stage: gitlab reports
# variables:
# URL: "https://submit.tudelft.nl"
# Run the container scanning security checks.
# Currently set to manual because we do not believe it adds anything to the current
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment