Add latest changes from gitlab-org/gitlab@master

4 files changed, 91 insertions, 0 deletions

diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 4362269103b..7d359dbc5c9 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -222,6 +222,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-12-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
@@ -232,6 +234,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.2-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
@@ -242,6 +246,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.2-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
@@ -252,6 +258,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-12-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
@@ -268,6 +276,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.2-alpine
     - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
@@ -284,6 +294,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.2-alpine
     - name: elasticsearch:7.17.6
       command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
@@ -300,6 +312,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: elasticsearch:8.6.2
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
@@ -317,6 +331,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: elasticsearch:8.6.2
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
@@ -334,6 +350,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: opensearchproject/opensearch:1.3.5
       alias: elasticsearch
@@ -351,6 +369,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: opensearchproject/opensearch:2.2.1
       alias: elasticsearch
@@ -368,6 +388,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: opensearchproject/opensearch:1.3.5
       alias: elasticsearch
@@ -385,6 +407,8 @@
     - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
       alias: postgres
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
+      alias: rediscluster # configure connections in config/redis.yml
     - name: redis:6.0-alpine
     - name: opensearchproject/opensearch:2.2.1
       alias: elasticsearch
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index a4041f771d9..d2820149102 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -120,6 +120,12 @@ rspec unit pg13:
     - .rails:rules:ee-and-foss-unit
     - .rspec-unit-parallel
 
+rspec unit pg13 single-redis:
+  extends:
+    - rspec unit pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec unit pg13 single-db:
   extends:
     - rspec unit pg13
@@ -144,6 +150,12 @@ rspec integration pg13:
     - .rails:rules:ee-and-foss-integration
     - .rspec-integration-parallel
 
+rspec integration pg13 single-redis:
+  extends:
+    - rspec integration pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec integration pg13 single-db:
   extends:
     - rspec integration pg13
@@ -170,6 +182,12 @@ rspec system pg13:
   variables:
     DEBUG_GITLAB_TRANSACTION_STACK: "true"
 
+rspec system pg13 single-redis:
+  extends:
+    - rspec system pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec system pg13 single-db:
   extends:
     - rspec system pg13
@@ -572,6 +590,12 @@ rspec-ee unit pg13 single-db:
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec-ee unit pg13 single-redis:
+  extends:
+    - rspec-ee unit pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec-ee unit pg13 single-db-ci-connection:
   extends:
     - rspec-ee unit pg13
@@ -595,6 +619,12 @@ rspec-ee integration pg13 single-db:
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec-ee integration pg13 single-redis:
+  extends:
+    - rspec-ee integration pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec-ee integration pg13 single-db-ci-connection:
   extends:
     - rspec-ee integration pg13
@@ -618,6 +648,12 @@ rspec-ee system pg13 single-db:
     - .single-db-rspec
     - .rails:rules:single-db
 
+rspec-ee system pg13 single-redis:
+  extends:
+    - rspec-ee system pg13
+    - .no-redis-cluster
+    - .rails:rules:single-redis
+
 rspec-ee system pg13 single-db-ci-connection:
   extends:
     - rspec-ee system pg13
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 33aef166afd..47226032d4f 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -28,6 +28,10 @@ include:
     - section_start "gitaly-test-spawn" "Spawning Gitaly"; scripts/gitaly-test-spawn; section_end "gitaly-test-spawn"  # Do not use 'bundle exec' here
     - echo -e "\e[0Ksection_end:`date +%s`:gitaly-test-spawn\r\e[0K"
 
+.no-redis-cluster:
+  variables:
+    USE_REDIS_CLUSTER: "false"
+
 .single-db:
   variables:
     DECOMPOSED_DB: "false"
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index a37d0e2be37..e76c127d420 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -338,6 +338,24 @@
   - "{,ee/,jh/}{bin,config,db,generator_templates,lib}/**/*"
   - "{,ee/,jh/}spec/**/*"
 
+# Redis patterns + feature flags
+.redis-patterns: &redis-patterns
+  - "{,ee/,jh/}{,spec/}app/models/concerns/redis_cacheable{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}app/models/ci/build_trace_chunks/redis{,_base,_trace_chunks}{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage_data_counters/{hll_redis_counter,redis_counter}{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage/metrics/instrumentations/redis{_metric,hll_metric}{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/usage/metrics/aggregates/sources/redis_hll{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/patch/action_cable_redis_listener{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/merge_requests/mergeability/redis_interface{,_spec}.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/markdown_cache/redis/*.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/redis/**/*.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/instrumentation/*.rb"
+  - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/redis.rb"
+  - "{,ee/,jh/}config/initializers/7_redis.rb"
+  # Feature flag changes
+  - "{,ee/,jh/}{,spec/}lib/feature.rb"
+  - "config/feature_flags/**/*"
+
 # DB patterns + .ci-patterns
 .db-patterns: &db-patterns
   - "{,ee/,jh/}{,spec/}{db,migrations}/**/*"
@@ -1567,6 +1585,15 @@
       changes: *setup-test-env-patterns
     - <<: *if-merge-request-labels-run-all-rspec
 
+.rails:rules:single-redis:
+  rules:
+    - <<: *if-merge-request-labels-run-single-db
+    - <<: *if-merge-request-labels-pipeline-expedite
+      when: never
+    - <<: *if-merge-request
+      changes: *redis-patterns
+    - <<: *if-default-branch-schedule-nightly
+
 .rails:rules:single-db:
   rules:
     - <<: *if-merge-request-labels-run-single-db