Commit a895dfb0 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '339248-pipeline-as-if-jh' into 'master'

Add rspec-jh and as-if-jh jobs to run when MR has pipeline:run-as-if-jh label

See merge request gitlab-org/gitlab!72959
parents 980005f6 c806d130
......@@ -77,6 +77,12 @@
- .use-pg12
needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests"]
.rspec-base-pg12-as-if-jh:
extends:
- .rspec-base
- .use-pg12
needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-jh", "detect-tests", "add-jh-folder"]
.rspec-base-pg13:
extends:
- .rspec-base
......@@ -92,6 +98,11 @@
- .rspec-base
- .use-pg12-ee
.rspec-jh-base-pg12:
extends:
- .rspec-base-pg12-as-if-jh
- .use-pg12-ee
.rspec-ee-base-pg13:
extends:
- .rspec-base
......@@ -113,6 +124,12 @@
- .rspec-ee-base-geo
- .use-pg12-ee
.rspec-jh-base-geo-pg12:
extends:
- .rspec-jh-base-pg12
script:
- !reference [.rspec-ee-base-geo, script]
.rspec-ee-base-geo-pg13:
extends:
- .rspec-ee-base-geo
......@@ -577,6 +594,31 @@ rspec system pg12-as-if-foss decomposed:
- .decomposed-database-rspec
- .rails:rules:decomposed-databases
rspec migration pg12-as-if-jh:
extends:
- .rspec-base-pg12-as-if-jh
- .rspec-base-migration
- .rails:rules:as-if-jh-rspec
- .rspec-migration-parallel
rspec unit pg12-as-if-jh:
extends:
- .rspec-base-pg12-as-if-jh
- .rails:rules:as-if-jh-rspec
- .rspec-unit-parallel
rspec integration pg12-as-if-jh:
extends:
- .rspec-base-pg12-as-if-jh
- .rails:rules:as-if-jh-rspec
- .rspec-integration-parallel
rspec system pg12-as-if-jh:
extends:
- .rspec-base-pg12-as-if-jh
- .rails:rules:as-if-jh-rspec
- .rspec-system-parallel
rspec-ee migration pg12:
extends:
- .rspec-ee-base-pg12
......@@ -684,6 +726,83 @@ rspec-ee system pg12 geo minimal:
- .minimal-rspec-tests
- .rails:rules:ee-only-system:minimal
rspec-ee migration pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rspec-base-migration
- .rails:rules:as-if-jh-rspec
- .rspec-ee-migration-parallel
rspec-ee unit pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
- .rspec-ee-unit-parallel
rspec-ee integration pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
- .rspec-ee-integration-parallel
rspec-ee system pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
- .rspec-ee-system-parallel
rspec-ee unit pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
- .rspec-ee-unit-geo-parallel
rspec-ee integration pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
rspec-ee system pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh migration pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rspec-base-migration
- .rails:rules:as-if-jh-rspec
rspec-jh unit pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh integration pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh system pg12-as-if-jh:
extends:
- .rspec-jh-base-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh unit pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh integration pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
rspec-jh system pg12-as-if-jh geo:
extends:
- .rspec-jh-base-geo-pg12
- .rails:rules:as-if-jh-rspec
db:rollback geo:
extends:
- db:rollback
......
......@@ -1179,6 +1179,21 @@
- <<: *if-merge-request-labels-as-if-foss
changes: *code-backstage-patterns
.rails:rules:as-if-jh-rspec:
rules:
- <<: *if-not-ee
when: never
- <<: *if-jh
when: never
- <<: *if-security-merge-request
changes: *code-backstage-patterns
allow_failure: true
- <<: *if-merge-request-labels-as-if-jh
allow_failure: true
- <<: *if-merge-request
changes: *ci-patterns
allow_failure: true
.rails:rules:ee-and-foss-db-library-code:
rules:
- changes: *db-library-patterns
......
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