Commit 1770dc5e authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'dont-run-coverage-frontend-on-foss' into 'master'

Don't run 'coverage-frontend' on FOSS as it's useless

See merge request gitlab-org/gitlab!27570
parents 84d232ca 652c21fd
...@@ -163,7 +163,7 @@ frontend-fixtures: ...@@ -163,7 +163,7 @@ frontend-fixtures:
frontend-fixtures-as-if-foss: frontend-fixtures-as-if-foss:
extends: extends:
- .frontend-fixtures-base - .frontend-fixtures-base
- .frontend:rules:default-frontend-jobs-as-if-foss - .frontend:rules:default-frontend-jobs-no-foss
- .as-if-foss - .as-if-foss
.frontend-job-base: .frontend-job-base:
...@@ -206,7 +206,7 @@ karma: ...@@ -206,7 +206,7 @@ karma:
karma-as-if-foss: karma-as-if-foss:
extends: extends:
- .karma-base - .karma-base
- .frontend:rules:default-frontend-jobs-as-if-foss - .frontend:rules:default-frontend-jobs-no-foss
- .as-if-foss - .as-if-foss
needs: ["frontend-fixtures-as-if-foss"] needs: ["frontend-fixtures-as-if-foss"]
...@@ -241,7 +241,7 @@ jest: ...@@ -241,7 +241,7 @@ jest:
jest-as-if-foss: jest-as-if-foss:
extends: extends:
- .jest-base - .jest-base
- .frontend:rules:default-frontend-jobs-as-if-foss - .frontend:rules:default-frontend-jobs-no-foss
- .as-if-foss - .as-if-foss
needs: ["frontend-fixtures-as-if-foss"] needs: ["frontend-fixtures-as-if-foss"]
cache: cache:
...@@ -250,7 +250,7 @@ jest-as-if-foss: ...@@ -250,7 +250,7 @@ jest-as-if-foss:
coverage-frontend: coverage-frontend:
extends: extends:
- .default-retry - .default-retry
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs-no-foss
needs: ["jest"] needs: ["jest"]
stage: post-test stage: post-test
before_script: before_script:
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
changes: *code-backstage-patterns changes: *code-backstage-patterns
when: on_success when: on_success
.frontend:rules:default-frontend-jobs-as-if-foss: .frontend:rules:default-frontend-jobs-no-foss:
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
......
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