Commit 5f256802 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ml-exclude-qa-internal-in-non-qa-pipelines' into 'master'

Exclude qa:internal in non-qa pipelines

See merge request gitlab-org/gitlab!84908
parents 41034ba7 71195edb
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
qa:internal: qa:internal:
extends: extends:
- .qa-job-base - .qa-job-base
- .qa:rules:ee-and-foss - .qa:rules:internal
script: script:
- bundle exec rspec - bundle exec rspec
qa:internal-as-if-foss: qa:internal-as-if-foss:
extends: extends:
- qa:internal - qa:internal
- .qa:rules:as-if-foss - .qa:rules:internal-as-if-foss
- .as-if-foss - .as-if-foss
qa:selectors: qa:selectors:
......
...@@ -858,6 +858,11 @@ ...@@ -858,6 +858,11 @@
############ ############
# QA rules # # QA rules #
############ ############
.qa:rules:internal:
rules:
- <<: *if-default-refs
changes: *qa-patterns
.qa:rules:ee-and-foss: .qa:rules:ee-and-foss:
rules: rules:
- <<: *if-default-refs - <<: *if-default-refs
...@@ -873,6 +878,12 @@ ...@@ -873,6 +878,12 @@
- <<: *if-merge-request - <<: *if-merge-request
changes: *ci-patterns changes: *ci-patterns
.qa:rules:internal-as-if-foss:
rules:
- !reference [".strict-ee-only-rules", rules]
- <<: *if-default-refs
changes: *qa-patterns
.qa:rules:package-and-qa: .qa:rules:package-and-qa:
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment