Add latest changes from gitlab-org/gitlab@master

3 files changed, 101 insertions, 0 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 84c3de51f9a..c0e08005f82 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -115,6 +115,18 @@ rspec background_migration pg14 praefect:
     - .praefect-with-db
     - .rails:rules:praefect-with-db
 
+rspec migration pg14 clusterwide-db:
+  extends:
+    - rspec migration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
+rspec background_migration pg14 clusterwide-db:
+  extends:
+    - rspec background_migration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec unit pg14:
   extends:
     - .rspec-base-pg14
@@ -139,6 +151,12 @@ rspec unit pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec unit pg14 clusterwide-db:
+  extends:
+    - rspec unit pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec unit pg14 praefect:
   extends:
     - rspec unit pg14
@@ -169,6 +187,12 @@ rspec integration pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec integration pg14 clusterwide-db:
+  extends:
+    - rspec integration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec integration pg14 praefect:
   extends:
     - rspec integration pg14
@@ -201,6 +225,12 @@ rspec system pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec system pg14 clusterwide-db:
+  extends:
+    - rspec system pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec system pg14 praefect:
   extends:
     - rspec system pg14
@@ -604,6 +634,18 @@ rspec background_migration pg14-as-if-foss single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection-as-if-foss
 
+rspec migration pg14-as-if-foss clusterwide-db:
+  extends:
+    - rspec migration pg14-as-if-foss
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
+rspec background_migration pg14-as-if-foss clusterwide-db:
+  extends:
+    - rspec background_migration pg14-as-if-foss
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec unit pg14-as-if-foss:
   extends:
     - .rspec-base-pg14-as-if-foss
@@ -622,6 +664,12 @@ rspec unit pg14-as-if-foss single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection-as-if-foss
 
+rspec unit pg14-as-if-foss clusterwide-db:
+  extends:
+    - rspec unit pg14-as-if-foss
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec integration pg14-as-if-foss:
   extends:
     - .rspec-base-pg14-as-if-foss
@@ -640,6 +688,12 @@ rspec integration pg14-as-if-foss single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection-as-if-foss
 
+rspec integration pg14-as-if-foss clusterwide-db:
+  extends:
+    - rspec integration pg14-as-if-foss
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec system pg14-as-if-foss:
   extends:
     - .rspec-base-pg14-as-if-foss
@@ -658,6 +712,12 @@ rspec system pg14-as-if-foss single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection-as-if-foss
 
+rspec system pg14-as-if-foss clusterwide-db:
+  extends:
+    - rspec system pg14-as-if-foss
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec-ee migration pg14:
   extends:
     - .rspec-ee-base-pg14
@@ -696,6 +756,18 @@ rspec-ee background_migration pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec-ee migration pg14 clusterwide-db:
+  extends:
+    - rspec-ee migration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
+rspec-ee background_migration pg14 clusterwide-db:
+  extends:
+    - rspec-ee background_migration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec-ee migration pg14 praefect:
   extends:
     - rspec migration pg14
@@ -737,6 +809,12 @@ rspec-ee unit pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec-ee unit pg14 clusterwide-db:
+  extends:
+    - rspec-ee unit pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec-ee integration pg14:
   extends:
     - .rspec-ee-base-pg14
@@ -766,6 +844,12 @@ rspec-ee integration pg14 single-db-ci-connection:
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
 
+rspec-ee integration pg14 clusterwide-db:
+  extends:
+    - rspec-ee integration pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
+
 rspec-ee system pg14:
   extends:
     - .rspec-ee-base-pg14
@@ -794,6 +878,12 @@ rspec-ee system pg14 single-db-ci-connection:
     - rspec-ee system pg14
     - .single-db-ci-connection-rspec
     - .rails:rules:single-db-ci-connection
+
+rspec-ee system pg14 clusterwide-db:
+  extends:
+    - rspec-ee system pg14
+    - .clusterwide-db
+    - .rails:rules:clusterwide-db
 # EE: default refs (MRs, default branch, schedules) jobs #
 ##################################################
 
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 4ebe4b2dae7..12bbad1bc62 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -30,6 +30,10 @@ include:
   variables:
     USE_REDIS_CLUSTER: "false"
 
+.clusterwide-db:
+  variables:
+    CLUSTERWIDE_DB: "true"
+
 .single-db:
   variables:
     DECOMPOSED_DB: "false"
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index f1905742ac6..5df4d7a5fe5 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -77,6 +77,9 @@
 .if-merge-request-labels-run-single-db: &if-merge-request-labels-run-single-db
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-single-db/'
 
+.if-merge-request-labels-run-clusterwide-db: &if-merge-request-labels-run-clusterwide-db
+  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-clusterwide-db/'
+
 .if-merge-request-labels-run-review-app: &if-merge-request-labels-run-review-app
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-review-app/'
 
@@ -1601,6 +1604,10 @@
       changes: *setup-test-env-patterns
     - <<: *if-merge-request-labels-run-all-rspec
 
+.rails:rules:clusterwide-db:
+  rules:
+    - <<: *if-merge-request-labels-run-clusterwide-db
+
 .rails:rules:single-redis:
   rules:
     - <<: *if-merge-request-labels-run-single-db