diff options
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 77d12a3e848..8881a4c486d 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -16,14 +16,14 @@ qa:internal: extends: - .qa-job-base - - .qa:rules:ee-and-foss + - .qa:rules:internal script: - - bundle exec rspec + - bundle exec rspec -O .rspec_internal qa:internal-as-if-foss: extends: - qa:internal - - .qa:rules:as-if-foss + - .qa:rules:internal-as-if-foss - .as-if-foss qa:selectors: @@ -33,15 +33,25 @@ qa:selectors: script: - bundle exec bin/qa Test::Sanity::Selectors -qa:auto_quarantine: +qa:master-auto-quarantine-dequarantine: + extends: + - .qa-job-base + rules: + - if: '$QA_TRIGGER_AUTO_QUARANTINE =~ /true|yes|1/i' + script: + - bundle exec confiner -r .confiner/master.yml + allow_failure: true + +qa:nightly-auto-quarantine-dequarantine: extends: - .qa-job-base rules: - if: '$QA_TRIGGER_AUTO_QUARANTINE =~ /true|yes|1/i' script: - - bundle exec confiner -r .confiner/quarantine.yml + - bundle exec confiner -r .confiner/nightly.yml allow_failure: true + qa:selectors-as-if-foss: extends: - qa:selectors |