diff options
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 127 |
1 files changed, 41 insertions, 86 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 23f38fddb80..95780116800 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -105,6 +105,18 @@ rspec background_migration pg12 single-db: - .single-db-rspec - .rails:rules:single-db +rspec migration pg12 single-db-ci-connection: + extends: + - rspec migration pg12 + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + +rspec background_migration pg12 single-db-ci-connection: + extends: + - rspec background_migration pg12 + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + rspec migration pg12 praefect: extends: - rspec migration pg12 @@ -191,16 +203,6 @@ rspec system pg12 praefect: - .praefect-with-db - .rails:rules:praefect-with-db -# Dedicated job to test DB library code against PG11. -# Note that these are already tested against PG12 in the `rspec unit pg12` / `rspec-ee unit pg12` jobs. -rspec db-library-code pg11: - extends: - - .rspec-base-pg11 - - .rails:rules:ee-and-foss-db-library-code - script: - - !reference [.base-script, script] - - rspec_db_library_code - rspec fast_spec_helper: extends: - .rspec-base-pg12 @@ -438,6 +440,18 @@ rspec background_migration pg12-as-if-foss single-db: - .single-db-rspec - .rails:rules:single-db +rspec migration pg12-as-if-foss single-db-ci-connection: + extends: + - rspec migration pg12-as-if-foss + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + +rspec background_migration pg12-as-if-foss single-db-ci-connection: + extends: + - rspec background_migration pg12-as-if-foss + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + rspec unit pg12-as-if-foss: extends: - .rspec-base-pg12-as-if-foss @@ -530,6 +544,18 @@ rspec-ee background_migration pg12 single-db: - .single-db-rspec - .rails:rules:single-db +rspec-ee migration pg12 single-db-ci-connection: + extends: + - rspec-ee migration pg12 + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + +rspec-ee background_migration pg12 single-db-ci-connection: + extends: + - rspec-ee background_migration pg12 + - .single-db-ci-connection-rspec + - .rails:rules:single-db-ci-connection + rspec-ee migration pg12 praefect: extends: - rspec migration pg12 @@ -616,39 +642,6 @@ rspec-ee system pg12 single-db: ########################################## # EE/FOSS: default branch nightly scheduled jobs # -# PG11 -rspec migration pg11: - extends: - - .rspec-base-pg11 - - .rspec-base-migration - - .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:rspec-on-pg11 - - .rspec-unit-parallel - -rspec integration pg11: - extends: - - .rspec-base-pg11 - - .rails:rules:rspec-on-pg11 - - .rspec-integration-parallel - -rspec system pg11: - extends: - - .rspec-base-pg11 - - .rails:rules:rspec-on-pg11 - - .rspec-system-parallel - # PG13 rspec migration pg13: extends: @@ -687,75 +680,36 @@ rspec system pg13: ##################################### # EE: default branch nightly scheduled jobs # -# PG11 -rspec-ee migration pg11: - extends: - - .rspec-ee-base-pg11 - - .rspec-base-migration - - .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 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - - .rspec-ee-unit-parallel - -rspec-ee integration pg11: - extends: - - .rspec-ee-base-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - - .rspec-ee-integration-parallel - -rspec-ee system pg11: - extends: - - .rspec-ee-base-pg11 - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only - - .rspec-ee-system-parallel - # PG12 rspec-ee unit pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 - .rspec-ee-unit-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only rspec-ee unit pg12 opensearch2: extends: - .rspec-ee-base-pg12-opensearch2 - .rspec-ee-unit-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only rspec-ee integration pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 - .rspec-ee-integration-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only rspec-ee integration pg12 opensearch2: extends: - .rspec-ee-base-pg12-opensearch2 - .rspec-ee-integration-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only rspec-ee system pg12 opensearch1: extends: - .rspec-ee-base-pg12-opensearch1 - .rspec-ee-system-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only rspec-ee system pg12 opensearch2: extends: - .rspec-ee-base-pg12-opensearch2 - .rspec-ee-system-parallel - - .rails:rules:default-branch-schedule-nightly--code-backstage-ee-only # PG13 rspec-ee migration pg13: @@ -821,13 +775,14 @@ rspec-foss-impact:pipeline-generate: extends: - .rails:rules:rspec-foss-impact stage: prepare - needs: ["detect-tests"] + needs: ["detect-tests", "retrieve-tests-metadata"] script: - - scripts/generate-rspec-foss-impact-pipeline "${RSPEC_MATCHING_TESTS_FOSS_PATH}" "${RSPEC_FOSS_IMPACT_PIPELINE_YML}" + - scripts/generate_rspec_pipeline.rb -f "${RSPEC_MATCHING_TESTS_FOSS_PATH}" -t "${RSPEC_FOSS_IMPACT_PIPELINE_TEMPLATE_YML}" -k "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" + - cat "${RSPEC_FOSS_IMPACT_PIPELINE_TEMPLATE_YML}.yml" artifacts: expire_in: 1 day paths: - - $RSPEC_FOSS_IMPACT_PIPELINE_YML + - "${RSPEC_FOSS_IMPACT_PIPELINE_TEMPLATE_YML}.yml" rspec-foss-impact:trigger: extends: @@ -850,7 +805,7 @@ rspec-foss-impact:trigger: yaml_variables: true pipeline_variables: true include: - - artifact: $RSPEC_FOSS_IMPACT_PIPELINE_YML + - artifact: "${RSPEC_FOSS_IMPACT_PIPELINE_TEMPLATE_YML}.yml" job: rspec-foss-impact:pipeline-generate fail-pipeline-early: |