Commit b48895f6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'alberts-pg12-schedule' into 'master'

Run PG12 on 2-hourly schedule

See merge request gitlab-org/gitlab!60250
parents 6612b31a 0c18de70
......@@ -680,25 +680,25 @@ rspec migration pg12:
extends:
- .rspec-base-pg12
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage
- .rspec-migration-parallel
rspec unit pg12:
extends:
- .rspec-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage
- .rspec-unit-parallel
rspec integration pg12:
extends:
- .rspec-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage
- .rspec-integration-parallel
rspec system pg12:
extends:
- .rspec-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage
- .rspec-system-parallel
# EE/FOSS: default branch nightly scheduled jobs #
##########################################
......@@ -709,42 +709,42 @@ rspec-ee migration pg12:
extends:
- .rspec-ee-base-pg12
- .rspec-base-migration
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
- .rspec-ee-migration-parallel
rspec-ee unit pg12:
extends:
- .rspec-ee-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
- .rspec-ee-unit-parallel
rspec-ee integration pg12:
extends:
- .rspec-ee-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
- .rspec-ee-integration-parallel
rspec-ee system pg12:
extends:
- .rspec-ee-base-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
- .rspec-ee-system-parallel
rspec-ee unit pg12 geo:
extends:
- .rspec-ee-base-geo-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
- .rspec-ee-unit-geo-parallel
rspec-ee integration pg12 geo:
extends:
- .rspec-ee-base-geo-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
rspec-ee system pg12 geo:
extends:
- .rspec-ee-base-geo-pg12
- .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only
- .rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only
# EE: default branch nightly scheduled jobs #
#####################################
......
......@@ -915,16 +915,18 @@
allow_failure: true
- <<: *if-merge-request-title-run-all-rspec
.rails:rules:default-branch-schedule-nightly--code-backstage:
.rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage:
rules:
- <<: *if-default-branch-schedule-2-hourly
- <<: *if-default-branch-schedule-nightly
- <<: *if-merge-request
changes: [".gitlab/ci/rails.gitlab-ci.yml"]
.rails:rules:default-branch-schedule-nightly--code-backstage-ee-only:
.rails:rules:default-branch-schedule-2-hourly-nightly--code-backstage-ee-only:
rules:
- <<: *if-not-ee
when: never
- <<: *if-default-branch-schedule-2-hourly
- <<: *if-default-branch-schedule-nightly
- <<: *if-merge-request
changes: [".gitlab/ci/rails.gitlab-ci.yml"]
......
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