Merge branch 'pb-update-check-schema-for-decomposed' into 'master'

Update db:check-schema job for decomposed CI

See merge request gitlab-org/gitlab!76395

.gitlab/ci/rails.gitlab-ci.yml

@@ -18,9 +18,13 @@
   variables:
     RSPEC_TESTS_MAPPING_ENABLED: "true"
 
-.decomposed-database-rspec:
+.decomposed-database:
   variables:
     DECOMPOSED_DB: "true"
+
+.decomposed-database-rspec:
+  extends: .decomposed-database
+  variables:
     GITLAB_LOAD_BALANCING_REUSE_PRIMARY_ci: "main"
     GITLAB_USE_MODEL_LOAD_BALANCING: "true"
 
@@ -370,9 +374,16 @@ db:migrate-from-previous-major-version:
   script:
     - run_timed_command "scripts/db_migrate"
 
-db:check-schema:
+db:migrate-from-previous-major-version-decomposed:
   extends:
     - db:migrate-from-previous-major-version
+    - .decomposed-database
+    - .rails:rules:decomposed-databases
+  variables:
+    GITLAB_MIGRATE_MAIN_ONLY: "true"
+
+.db:check-schema-base:
+  extends:
     - .rails:rules:ee-mr-and-default-branch-only
   variables:
     TAG_TO_CHECKOUT: "v14.4.0"
@@ -381,6 +392,16 @@ db:check-schema:
     - scripts/schema_changed.sh
     - scripts/validate_migration_timestamps
 
+db:check-schema:
+  extends:
+    - db:migrate-from-previous-major-version
+    - .db:check-schema-base
+
+db:check-schema-decomposed:
+  extends:
+    - db:migrate-from-previous-major-version-decomposed
+    - .db:check-schema-base
+
 db:check-migrations:
   extends:
     - .db-job-base

scripts/db_migrate

@@ -2,7 +2,7 @@
 
 root_path="$(cd "$(dirname "$0")/.." || exit ; pwd -P)"
 
-if [[ -d "${root_path}/ee/" ]]; then
+if [[ -d "${root_path}/ee/" || "${GITLAB_MIGRATE_MAIN_ONLY}" == "true" ]]; then
 	task="db:migrate:main"
 else
 	task="db:migrate"