Commit 32f026c3 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'consistent-setup-test-env-rules' into 'master'

Allow setup-test-env run for anything needs tests

See merge request gitlab-org/gitlab!55826
parents 9458c49d 8f754e7b
...@@ -142,7 +142,7 @@ setup-test-env: ...@@ -142,7 +142,7 @@ setup-test-env:
extends: extends:
- .rails-job-base - .rails-job-base
- .setup-test-env-cache - .setup-test-env-cache
- .rails:rules:default-refs-code-backstage-qa - .rails:rules:code-backstage-qa
- .use-pg11 - .use-pg11
stage: prepare stage: prepare
variables: variables:
...@@ -244,7 +244,7 @@ update-static-analysis-cache: ...@@ -244,7 +244,7 @@ update-static-analysis-cache:
static-analysis: static-analysis:
extends: extends:
- .static-analysis-base - .static-analysis-base
- .rails:rules:default-refs-code-backstage-qa - .rails:rules:code-backstage-qa
stage: test stage: test
parallel: 4 parallel: 4
script: script:
......
...@@ -610,10 +610,9 @@ ...@@ -610,10 +610,9 @@
- <<: *if-merge-request - <<: *if-merge-request
changes: ["config/**/*"] changes: ["config/**/*"]
.rails:rules:default-refs-code-backstage-qa: .rails:rules:code-backstage-qa:
rules: rules:
- <<: *if-default-refs - changes: *code-backstage-qa-patterns
changes: *code-backstage-qa-patterns
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
.rails:rules:ee-only-migration: .rails:rules:ee-only-migration:
...@@ -825,8 +824,7 @@ ...@@ -825,8 +824,7 @@
.rails:rules:detect-tests: .rails:rules:detect-tests:
rules: rules:
- <<: *if-default-refs - changes: *code-backstage-patterns
changes: *code-backstage-patterns
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
.rails:rules:rspec-foss-impact: .rails:rules:rspec-foss-impact:
...@@ -1139,8 +1137,7 @@ ...@@ -1139,8 +1137,7 @@
####################### #######################
.test-metadata:rules:retrieve-tests-metadata: .test-metadata:rules:retrieve-tests-metadata:
rules: rules:
- <<: *if-default-refs - changes: *code-backstage-patterns
changes: *code-backstage-patterns
when: on_success when: on_success
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
......
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