Add latest changes from gitlab-org/gitlab@master

2 files changed, 31 insertions, 13 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index ad5da0048f9..c841d69b40d 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -825,25 +825,25 @@ rspec-ee migration pg14 single-db:
   extends:
     - rspec-ee migration pg14
     - .single-db-rspec
-    - .rails:rules:single-db
+    - .rails:rules:single-db-ee
 
 rspec-ee background_migration pg14 single-db:
   extends:
     - rspec-ee background_migration pg14
     - .single-db-rspec
-    - .rails:rules:single-db
+    - .rails:rules:single-db-ee
 
 rspec-ee migration pg14 single-db-ci-connection:
   extends:
     - rspec-ee migration pg14
     - .single-db-ci-connection-rspec
-    - .rails:rules:single-db-ci-connection
+    - .rails:rules:single-db-ci-connection-ee
 
 rspec-ee background_migration pg14 single-db-ci-connection:
   extends:
     - rspec-ee background_migration pg14
     - .single-db-ci-connection-rspec
-    - .rails:rules:single-db-ci-connection
+    - .rails:rules:single-db-ci-connection-ee
 
 rspec-ee migration pg14 clusterwide-db:
   extends:
@@ -887,21 +887,21 @@ rspec-ee unit pg14 single-db:
     - rspec-ee unit pg14
     - .single-db-rspec
     - .rspec-ee-unit-parallel
-    - .rails:rules:single-db
+    - .rails:rules:single-db-ee
 
 rspec-ee unit pg14 single-redis:
   extends:
     - rspec-ee unit pg14
     - .no-redis-cluster
     - .rspec-ee-unit-parallel
-    - .rails:rules:single-redis
+    - .rails:rules:single-redis-ee
 
 rspec-ee unit pg14 single-db-ci-connection:
   extends:
     - rspec-ee unit pg14
     - .single-db-ci-connection-rspec
     - .rspec-ee-unit-parallel
-    - .rails:rules:single-db-ci-connection
+    - .rails:rules:single-db-ci-connection-ee
 
 rspec-ee unit pg14 clusterwide-db:
   extends:
@@ -926,21 +926,21 @@ rspec-ee integration pg14 single-db:
     - rspec-ee integration pg14
     - .single-db-rspec
     - .rspec-ee-integration-parallel
-    - .rails:rules:single-db
+    - .rails:rules:single-db-ee
 
 rspec-ee integration pg14 single-redis:
   extends:
     - rspec-ee integration pg14
     - .no-redis-cluster
     - .rspec-ee-integration-parallel
-    - .rails:rules:single-redis
+    - .rails:rules:single-redis-ee
 
 rspec-ee integration pg14 single-db-ci-connection:
   extends:
     - rspec-ee integration pg14
     - .single-db-ci-connection-rspec
     - .rspec-ee-integration-parallel
-    - .rails:rules:single-db-ci-connection
+    - .rails:rules:single-db-ci-connection-ee
 
 rspec-ee integration pg14 clusterwide-db:
   extends:
@@ -965,21 +965,21 @@ rspec-ee system pg14 single-db:
     - rspec-ee system pg14
     - .single-db-rspec
     - .rspec-ee-system-parallel
-    - .rails:rules:single-db
+    - .rails:rules:single-db-ee
 
 rspec-ee system pg14 single-redis:
   extends:
     - rspec-ee system pg14
     - .no-redis-cluster
     - .rspec-ee-system-parallel
-    - .rails:rules:single-redis
+    - .rails:rules:single-redis-ee
 
 rspec-ee system pg14 single-db-ci-connection:
   extends:
     - rspec-ee system pg14
     - .single-db-ci-connection-rspec
     - .rspec-ee-system-parallel
-    - .rails:rules:single-db-ci-connection
+    - .rails:rules:single-db-ci-connection-ee
 
 rspec-ee system pg14 clusterwide-db:
   extends:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index f2f0d2f4775..58bd11e3d9e 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1911,6 +1911,12 @@
       changes: *redis-patterns
     - <<: *if-default-branch-schedule-nightly
 
+.rails:rules:single-redis-ee:
+  rules:
+    - <<: *if-not-ee
+      when: never
+    - !reference [".rails:rules:single-redis", "rules"]
+
 .rails:rules:single-db:
   rules:
     - <<: *if-merge-request-labels-run-single-db
@@ -1922,6 +1928,12 @@
       changes: *decomposed-db-models-patterns
     - <<: *if-default-branch-schedule-nightly
 
+.rails:rules:single-db-ee:
+  rules:
+    - <<: *if-not-ee
+      when: never
+    - !reference [".rails:rules:single-db", "rules"]
+
 .rails:rules:single-db-as-if-foss:
   rules:
     - !reference [".strict-ee-only-rules", rules]
@@ -1948,6 +1960,12 @@
       changes: *decomposed-db-models-patterns
     - <<: *if-default-branch-schedule-nightly
 
+.rails:rules:single-db-ci-connection-ee:
+  rules:
+    - <<: *if-not-ee
+      when: never
+    - !reference [".rails:rules:single-db-ci-connection", "rules"]
+
 .rails:rules:single-db-ci-connection-as-if-foss:
   rules:
     - !reference [".strict-ee-only-rules", rules]