Commit 25924dac authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '204641-fix-master-setup-test-env' into 'master'

Run quarantine and pg10 for code changes only on master

Closes #204641

See merge request gitlab-org/gitlab!24766
parents 973af1b3 e5f3a14e
...@@ -75,16 +75,18 @@ ...@@ -75,16 +75,18 @@
changes: *code-backstage-qa-patterns changes: *code-backstage-qa-patterns
when: on_success when: on_success
.rails:rules:master-refs: .rails:rules:master-refs-code-backstage-qa:
rules: rules:
- <<: *if-master-refs - <<: *if-master-refs
changes: *code-backstage-qa-patterns
when: on_success when: on_success
.rails:rules:master-refs-ee-only: .rails:rules:master-refs-code-backstage-qa-ee-only:
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-master-refs - <<: *if-master-refs
changes: *code-backstage-qa-patterns
when: on_success when: on_success
.rails:rules:ee-only: .rails:rules:ee-only:
...@@ -330,12 +332,12 @@ coverage: ...@@ -330,12 +332,12 @@ coverage:
rspec quarantine pg9: rspec quarantine pg9:
extends: extends:
- .rspec-base-quarantine - .rspec-base-quarantine
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
.rspec-base-pg10: .rspec-base-pg10:
extends: extends:
- .rspec-base - .rspec-base
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
- .use-pg10 - .use-pg10
rspec unit pg10: rspec unit pg10:
...@@ -357,7 +359,7 @@ rspec system pg10: ...@@ -357,7 +359,7 @@ rspec system pg10:
rspec-ee quarantine pg9: rspec-ee quarantine pg9:
extends: extends:
- .rspec-base-quarantine - .rspec-base-quarantine
- .rails:rules:master-refs-ee-only - .rails:rules:master-refs-code-backstage-qa-ee-only
variables: variables:
RSPEC_OPTS: "--tag quarantine -- ee/spec/" RSPEC_OPTS: "--tag quarantine -- ee/spec/"
...@@ -365,25 +367,25 @@ rspec-ee migration pg10: ...@@ -365,25 +367,25 @@ rspec-ee migration pg10:
extends: extends:
- .rspec-ee-base-pg10 - .rspec-ee-base-pg10
- .rspec-base-migration - .rspec-base-migration
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
parallel: 2 parallel: 2
rspec-ee unit pg10: rspec-ee unit pg10:
extends: extends:
- .rspec-ee-base-pg10 - .rspec-ee-base-pg10
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
parallel: 10 parallel: 10
rspec-ee integration pg10: rspec-ee integration pg10:
extends: extends:
- .rspec-ee-base-pg10 - .rspec-ee-base-pg10
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
parallel: 3 parallel: 3
rspec-ee system pg10: rspec-ee system pg10:
extends: extends:
- .rspec-ee-base-pg10 - .rspec-ee-base-pg10
- .rails:rules:master-refs - .rails:rules:master-refs-code-backstage-qa
parallel: 5 parallel: 5
# ee + master-only jobs # # ee + master-only jobs #
######################### #########################
......
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