diff options
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 253 |
1 files changed, 174 insertions, 79 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 0e0aeb2954b..df3b3704a52 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -71,13 +71,27 @@ rspec migration pg12: extends: - .rspec-base-pg12 - .rspec-base-migration + - .rails:rules:ee-and-foss-migration - .rspec-migration-parallel -rspec migration pg12 minimal: +rspec migration pg12 predictive: extends: - rspec migration pg12 - - .minimal-rspec-tests - - .rails:rules:ee-and-foss-migration:minimal + - .predictive-rspec-tests + - .rails:rules:ee-and-foss-migration:predictive + +rspec background_migration pg12: + extends: + - .rspec-base-pg12 + - .rspec-base-migration + - .rails:rules:ee-and-foss-background-migration + - .rspec-background-migration-parallel + +rspec background_migration pg12 predictive: + extends: + - rspec background_migration pg12 + - .predictive-rspec-tests + - .rails:rules:ee-and-foss-background-migration:predictive rspec migration pg12 single-db: extends: @@ -85,23 +99,35 @@ rspec migration pg12 single-db: - .single-db-rspec - .rails:rules:single-db +rspec background_migration pg12 single-db: + extends: + - rspec background_migration pg12 + - .single-db-rspec + - .rails:rules:single-db + rspec migration pg12 praefect: extends: - rspec migration pg12 - .praefect-with-db - .rails:rules:praefect-with-db +rspec background_migration pg12 praefect: + extends: + - rspec background_migration pg12 + - .praefect-with-db + - .rails:rules:praefect-with-db + rspec unit pg12: extends: - .rspec-base-pg12 - .rails:rules:ee-and-foss-unit - .rspec-unit-parallel -rspec unit pg12 minimal: +rspec unit pg12 predictive: extends: - rspec unit pg12 - - .minimal-rspec-tests - - .rails:rules:ee-and-foss-unit:minimal + - .predictive-rspec-tests + - .rails:rules:ee-and-foss-unit:predictive rspec unit pg12 single-db: extends: @@ -121,11 +147,11 @@ rspec integration pg12: - .rails:rules:ee-and-foss-integration - .rspec-integration-parallel -rspec integration pg12 minimal: +rspec integration pg12 predictive: extends: - rspec integration pg12 - - .minimal-rspec-tests - - .rails:rules:ee-and-foss-integration:minimal + - .predictive-rspec-tests + - .rails:rules:ee-and-foss-integration:predictive rspec integration pg12 single-db: extends: @@ -147,11 +173,11 @@ rspec system pg12: variables: DEBUG_GITLAB_TRANSACTION_STACK: "true" -rspec system pg12 minimal: +rspec system pg12 predictive: extends: - rspec system pg12 - - .minimal-rspec-tests - - .rails:rules:ee-and-foss-system:minimal + - .predictive-rspec-tests + - .rails:rules:ee-and-foss-system:predictive rspec system pg12 single-db: extends: @@ -187,7 +213,7 @@ rspec fast_spec_helper: db:rollback: extends: .db-job-base script: - - scripts/db_tasks db:migrate VERSION=20210301200959 + - scripts/db_tasks db:migrate VERSION=20210602155110 - scripts/db_tasks db:migrate SKIP_SCHEMA_VERSION_CHECK=true db:rollback single-db: @@ -287,7 +313,9 @@ gitlab:setup: - log/*.log db:backup_and_restore: - extends: .db-job-base + extends: + - .db-job-base + - .rails:rules:db-backup variables: SETUP_DB: "false" GITLAB_ASSUME_YES: "1" @@ -298,16 +326,12 @@ db:backup_and_restore: - bundle exec rake gitlab:backup:create - date - bundle exec rake gitlab:backup:restore - rules: - - changes: - - "lib/backup/**/*" - - "lib/tasks/gitlab/backup.rake" db:backup_and_restore single-db: extends: - db:backup_and_restore - .single-db - - .rails:rules:single-db + - .rails:rules:db-backup rspec:deprecations: extends: @@ -321,10 +345,12 @@ rspec:deprecations: # so we use `dependencies` here. dependencies: - rspec migration pg12 + - rspec background_migration pg12 - rspec unit pg12 - rspec integration pg12 - rspec system pg12 - rspec-ee migration pg12 + - rspec-ee background_migration pg12 - rspec-ee unit pg12 - rspec-ee integration pg12 - rspec-ee system pg12 @@ -351,31 +377,37 @@ rspec:coverage: - setup-test-env # FOSS/EE jobs - rspec migration pg12 + - rspec background_migration pg12 - rspec unit pg12 - rspec integration pg12 - rspec system pg12 - # FOSS/EE minimal jobs - - rspec migration pg12 minimal - - rspec unit pg12 minimal - - rspec integration pg12 minimal - - rspec system pg12 minimal + # FOSS/EE predictive jobs + - rspec migration pg12 predictive + - rspec background_migration pg12 predictive + - rspec unit pg12 predictive + - rspec integration pg12 predictive + - rspec system pg12 predictive # FOSS/EE single-db jobs - rspec migration pg12 single-db + - rspec background_migration pg12 single-db - rspec unit pg12 single-db - rspec integration pg12 single-db - rspec system pg12 single-db # EE jobs - rspec-ee migration pg12 + - rspec-ee background_migration pg12 - rspec-ee unit pg12 - rspec-ee integration pg12 - rspec-ee system pg12 - # EE minimal jobs - - rspec-ee migration pg12 minimal - - rspec-ee unit pg12 minimal - - rspec-ee integration pg12 minimal - - rspec-ee system pg12 minimal + # EE predictive jobs + - rspec-ee migration pg12 predictive + - rspec-ee background_migration pg12 predictive + - rspec-ee unit pg12 predictive + - rspec-ee integration pg12 predictive + - rspec-ee system pg12 predictive # EE single-db jobs - rspec-ee migration pg12 single-db + - rspec-ee background_migration pg12 single-db - rspec-ee unit pg12 single-db - rspec-ee integration pg12 single-db - rspec-ee system pg12 single-db @@ -383,16 +415,19 @@ rspec:coverage: - memory-on-boot # As-if-FOSS jobs - rspec migration pg12-as-if-foss - - rspec migration pg12-as-if-foss minimal + - rspec migration pg12-as-if-foss predictive - rspec migration pg12-as-if-foss single-db + - rspec background_migration pg12-as-if-foss + - rspec background_migration pg12-as-if-foss predictive + - rspec background_migration pg12-as-if-foss single-db - rspec unit pg12-as-if-foss - - rspec unit pg12-as-if-foss minimal + - rspec unit pg12-as-if-foss predictive - rspec unit pg12-as-if-foss single-db - rspec integration pg12-as-if-foss - - rspec integration pg12-as-if-foss minimal + - rspec integration pg12-as-if-foss predictive - rspec integration pg12-as-if-foss single-db - rspec system pg12-as-if-foss - - rspec system pg12-as-if-foss minimal + - rspec system pg12-as-if-foss predictive - rspec system pg12-as-if-foss single-db script: - run_timed_command "bundle exec scripts/merge-simplecov" @@ -478,11 +513,24 @@ rspec migration pg12-as-if-foss: - .rails:rules:as-if-foss-migration - .rspec-migration-parallel -rspec migration pg12-as-if-foss minimal: +rspec migration pg12-as-if-foss predictive: extends: - rspec migration pg12-as-if-foss - - .minimal-rspec-tests - - .rails:rules:as-if-foss-migration:minimal + - .predictive-rspec-tests + - .rails:rules:as-if-foss-migration:predictive + +rspec background_migration pg12-as-if-foss: + extends: + - .rspec-base-pg12-as-if-foss + - .rspec-base-migration + - .rails:rules:as-if-foss-background-migration + - .rspec-background-migration-parallel + +rspec background_migration pg12-as-if-foss predictive: + extends: + - rspec background_migration pg12-as-if-foss + - .predictive-rspec-tests + - .rails:rules:as-if-foss-background-migration:predictive rspec migration pg12-as-if-foss single-db: extends: @@ -490,17 +538,23 @@ rspec migration pg12-as-if-foss single-db: - .single-db-rspec - .rails:rules:single-db +rspec background_migration pg12-as-if-foss single-db: + extends: + - rspec background_migration pg12-as-if-foss + - .single-db-rspec + - .rails:rules:single-db + rspec unit pg12-as-if-foss: extends: - .rspec-base-pg12-as-if-foss - .rails:rules:as-if-foss-unit - .rspec-unit-parallel -rspec unit pg12-as-if-foss minimal: +rspec unit pg12-as-if-foss predictive: extends: - rspec unit pg12-as-if-foss - - .minimal-rspec-tests - - .rails:rules:as-if-foss-unit:minimal + - .predictive-rspec-tests + - .rails:rules:as-if-foss-unit:predictive rspec unit pg12-as-if-foss single-db: extends: @@ -514,11 +568,11 @@ rspec integration pg12-as-if-foss: - .rails:rules:as-if-foss-integration - .rspec-integration-parallel -rspec integration pg12-as-if-foss minimal: +rspec integration pg12-as-if-foss predictive: extends: - rspec integration pg12-as-if-foss - - .minimal-rspec-tests - - .rails:rules:as-if-foss-integration:minimal + - .predictive-rspec-tests + - .rails:rules:as-if-foss-integration:predictive rspec integration pg12-as-if-foss single-db: extends: @@ -532,11 +586,11 @@ rspec system pg12-as-if-foss: - .rails:rules:as-if-foss-system - .rspec-system-parallel -rspec system pg12-as-if-foss minimal: +rspec system pg12-as-if-foss predictive: extends: - rspec system pg12-as-if-foss - - .minimal-rspec-tests - - .rails:rules:as-if-foss-system:minimal + - .predictive-rspec-tests + - .rails:rules:as-if-foss-system:predictive rspec system pg12-as-if-foss single-db: extends: @@ -551,11 +605,24 @@ rspec-ee migration pg12: - .rails:rules:ee-only-migration - .rspec-ee-migration-parallel -rspec-ee migration pg12 minimal: +rspec-ee migration pg12 predictive: extends: - rspec-ee migration pg12 - - .minimal-rspec-tests - - .rails:rules:ee-only-migration:minimal + - .predictive-rspec-tests + - .rails:rules:ee-only-migration:predictive + +rspec-ee background_migration pg12: + extends: + - .rspec-ee-base-pg12 + - .rspec-base-migration + - .rails:rules:ee-only-background-migration + - .rspec-ee-background-migration-parallel + +rspec-ee background_migration pg12 predictive: + extends: + - rspec-ee background_migration pg12 + - .predictive-rspec-tests + - .rails:rules:ee-only-background-migration:predictive rspec-ee migration pg12 single-db: extends: @@ -563,6 +630,24 @@ rspec-ee migration pg12 single-db: - .single-db-rspec - .rails:rules:single-db +rspec-ee background_migration pg12 single-db: + extends: + - rspec-ee background_migration pg12 + - .single-db-rspec + - .rails:rules:single-db + +rspec-ee migration pg12 praefect: + extends: + - rspec migration pg12 + - .praefect-with-db + - .rails:rules:praefect-with-db + +rspec-ee background_migration pg12 praefect: + extends: + - rspec background_migration pg12 + - .praefect-with-db + - .rails:rules:praefect-with-db + rspec-ee unit pg12: extends: - .rspec-ee-base-pg12 @@ -574,11 +659,11 @@ rspec-ee unit pg12 es8: - .rspec-ee-base-pg12-es8 - .rspec-ee-unit-parallel -rspec-ee unit pg12 minimal: +rspec-ee unit pg12 predictive: extends: - rspec-ee unit pg12 - - .minimal-rspec-tests - - .rails:rules:ee-only-unit:minimal + - .predictive-rspec-tests + - .rails:rules:ee-only-unit:predictive rspec-ee unit pg12 single-db: extends: @@ -597,11 +682,11 @@ rspec-ee integration pg12 es8: - .rspec-ee-base-pg12-es8 - .rspec-ee-integration-parallel -rspec-ee integration pg12 minimal: +rspec-ee integration pg12 predictive: extends: - rspec-ee integration pg12 - - .minimal-rspec-tests - - .rails:rules:ee-only-integration:minimal + - .predictive-rspec-tests + - .rails:rules:ee-only-integration:predictive rspec-ee integration pg12 single-db: extends: @@ -620,11 +705,11 @@ rspec-ee system pg12 es8: - .rspec-ee-base-pg12-es8 - .rspec-ee-system-parallel -rspec-ee system pg12 minimal: +rspec-ee system pg12 predictive: extends: - rspec-ee system pg12 - - .minimal-rspec-tests - - .rails:rules:ee-only-system:minimal + - .predictive-rspec-tests + - .rails:rules:ee-only-system:predictive rspec-ee system pg12 single-db: extends: @@ -650,25 +735,32 @@ rspec migration pg11: extends: - .rspec-base-pg11 - .rspec-base-migration - - .rails:rules:default-branch-schedule-nightly--code-backstage + - .rails:rules:rspec-on-pg11 - .rspec-migration-parallel +rspec background_migration pg11: + extends: + - .rspec-base-pg11 + - .rspec-base-migration + - .rails:rules:rspec-on-pg11 + - .rspec-background-migration-parallel + rspec unit pg11: extends: - .rspec-base-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage + - .rails:rules:rspec-on-pg11 - .rspec-unit-parallel rspec integration pg11: extends: - .rspec-base-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage + - .rails:rules:rspec-on-pg11 - .rspec-integration-parallel rspec system pg11: extends: - .rspec-base-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage + - .rails:rules:rspec-on-pg11 - .rspec-system-parallel # PG13 @@ -679,6 +771,13 @@ rspec migration pg13: - .rails:rules:default-branch-schedule-nightly--code-backstage - .rspec-migration-parallel +rspec background_migration pg13: + extends: + - .rspec-base-pg13 + - .rspec-base-migration + - .rails:rules:default-branch-schedule-nightly--code-backstage + - .rspec-background-migration-parallel + rspec unit pg13: extends: - .rspec-base-pg13 @@ -710,6 +809,13 @@ rspec-ee migration pg11: - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - .rspec-ee-migration-parallel +rspec-ee background_migration pg11: + extends: + - .rspec-ee-base-pg11 + - .rspec-base-migration + - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only + - .rspec-ee-background-migration-parallel + rspec-ee unit pg11: extends: - .rspec-ee-base-pg11 @@ -729,12 +835,6 @@ rspec-ee system pg11: - .rspec-ee-system-parallel # PG12 -rspec-ee unit pg12 es7: - extends: - - .rspec-ee-base-pg12-es7 - - .rspec-ee-unit-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - rspec-ee unit pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 @@ -747,12 +847,6 @@ rspec-ee unit pg12 opensearch2: - .rspec-ee-unit-parallel - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only -rspec-ee integration pg12 es7: - extends: - - .rspec-ee-base-pg12-es7 - - .rspec-ee-integration-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - rspec-ee integration pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 @@ -765,12 +859,6 @@ rspec-ee integration pg12 opensearch2: - .rspec-ee-integration-parallel - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only -rspec-ee system pg12 es7: - extends: - - .rspec-ee-base-pg12-es7 - - .rspec-ee-system-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - rspec-ee system pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 @@ -791,6 +879,13 @@ rspec-ee migration pg13: - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - .rspec-ee-migration-parallel +rspec-ee background_migration pg13: + extends: + - .rspec-ee-base-pg13 + - .rspec-base-migration + - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only + - .rspec-ee-background-migration-parallel + rspec-ee unit pg13: extends: - .rspec-ee-base-pg13 |