Commit f6bebf0b authored by Robert Speicher's avatar Robert Speicher

Merge branch '214864-don-t-run-coverage-jobs-on-auto-deploy-branches' into 'master'

Only run the coverage jobs for EE master and MRs

Closes #214864

See merge request gitlab-org/gitlab!30391
parents 93176e9f 7c7c50e0
...@@ -241,7 +241,7 @@ jest-as-if-foss: ...@@ -241,7 +241,7 @@ jest-as-if-foss:
coverage-frontend: coverage-frontend:
extends: extends:
- .default-retry - .default-retry
- .frontend:rules:default-frontend-jobs-no-foss - .frontend:rules:ee-mr-and-master-only
needs: ["jest"] needs: ["jest"]
stage: post-test stage: post-test
before_script: before_script:
......
...@@ -197,7 +197,7 @@ gitlab:setup: ...@@ -197,7 +197,7 @@ gitlab:setup:
rspec:coverage: rspec:coverage:
extends: extends:
- .rails-job-base - .rails-job-base
- .rails:rules:ee-only - .rails:rules:ee-mr-and-master-only
stage: post-test stage: post-test
# We cannot use needs since it would mean needing 84 jobs (since most are parallelized) # We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
# so we use `dependencies` here. # so we use `dependencies` here.
......
...@@ -287,6 +287,15 @@ ...@@ -287,6 +287,15 @@
changes: *code-backstage-patterns changes: *code-backstage-patterns
when: on_success when: on_success
.frontend:rules:ee-mr-and-master-only:
rules:
- <<: *if-not-ee
when: never
- <<: *if-merge-request
changes: *code-backstage-patterns
- <<: *if-master-refs
changes: *code-backstage-patterns
.frontend:rules:qa-frontend-node: .frontend:rules:qa-frontend-node:
rules: rules:
- <<: *if-master-refs - <<: *if-master-refs
...@@ -390,6 +399,15 @@ ...@@ -390,6 +399,15 @@
changes: *code-backstage-patterns changes: *code-backstage-patterns
when: on_success when: on_success
.rails:rules:ee-mr-and-master-only:
rules:
- <<: *if-not-ee
when: never
- <<: *if-merge-request
changes: *code-backstage-patterns
- <<: *if-master-refs
changes: *code-backstage-patterns
.rails:rules:downtime_check: .rails:rules:downtime_check:
rules: rules:
- <<: *if-merge-request - <<: *if-merge-request
......
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