Add latest changes from gitlab-org/gitlab@master

6 files changed, 49 insertions, 10 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 743141f1f9b..38b60413db5 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -59,6 +59,10 @@ GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend
 /ee/app/finders/
 /rubocop/rubocop-migrations.yml
 
+[Create::IDE - Remote Development Scripts] @gitlab-org/maintainers/remote-development/backend
+# This entry must occur before `/scripts/` in order to be matched first
+/scripts/remote_development/
+
 [Engineering Productivity] @gl-quality/eng-prod
 /.gitlab-ci.yml
 /.gitlab/ci/
@@ -1448,8 +1452,7 @@ ee/lib/ee/api/entities/project.rb
 /ee/spec/elastic/migrate/
 /ee/spec/support/elastic.rb
 
-[Create::IDE - Remote Development Backend]  @gitlab-org/maintainers/remote-development/backend
-
+[Create::IDE - Remote Development Backend] @gitlab-org/maintainers/remote-development/backend
 /ee/app/models/remote_development/
 /ee/app/policies/remote_development/
 /ee/app/finders/remote_development/
@@ -1474,10 +1477,8 @@ ee/lib/ee/api/entities/project.rb
 /ee/spec/services/remote_development/
 /ee/lib/remote_development/
 /qa/qa/specs/features/ee/browser_ui/3_create/remote_development/
-/scripts/remote_development/
-
-[Create::IDE - Remote Development Frontend]  @gitlab-org/maintainers/remote-development/frontend
 
+[Create::IDE - Remote Development Frontend] @gitlab-org/maintainers/remote-development/frontend
 /ee/app/views/remote_development/
 /ee/app/assets/javascripts/remote_development/
 /ee/app/assets/javascripts/pages/remote_development/
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 99f27f61b93..c501d930352 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -382,6 +382,24 @@
   variables:
     PG_VERSION: "15"
 
+.use-pg14-clickhouse23:
+  services:
+    - 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: clickhouse/clickhouse-server:23-alpine
+      alias: clickhouse
+  variables:
+    POSTGRES_HOST_AUTH_METHOD: trust
+    PG_VERSION: "14"
+    CLICKHOUSE_USER: clickhouse
+    CLICKHOUSE_PASSWORD: clickhouse
+    CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
+    CLICKHOUSE_DB: gitlab_clickhouse_test
+
 .use-kaniko:
   image:
     name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index c0e08005f82..9338f5cf7e5 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -266,6 +266,11 @@ rspec fast_spec_helper:
     # Load fast_spec_helper as well just in case there are no specs available.
     - bin/rspec --dry-run spec/fast_spec_helper.rb $fast_spec_helper_specs
 
+rspec unit clickhouse:
+  extends:
+    - .rspec-base-pg14-clickhouse23
+    - .rails:rules:clickhouse-changes
+
 gitlab:setup:
   extends: .db-job-base
   variables:
@@ -1190,7 +1195,7 @@ rspec-ee system pg15 es8:
   needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"]
   script:
     - !reference [.base-script, script]
-    - rspec_fail_fast "${MATCHING_TESTS_PATH}" "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt"
+    - rspec_fail_fast "${MATCHING_TESTS_PATH}" "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt --tag ~click_house"
 
 rspec fail-fast:
   extends:
diff --git a/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb b/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
index fc5eccb99a2..4584cba0282 100644
--- a/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
+++ b/.gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
@@ -39,7 +39,7 @@ dont-interrupt-me:
     RSPEC_TESTS_MAPPING_ENABLED: "true"
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~zoekt"
+    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~zoekt --tag ~click_house"
   artifacts:
     expire_in: 7d
     paths:
@@ -54,7 +54,7 @@ rspec migration foss-impact:
 <% end %>
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt"
+    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt --tag ~click_house"
 <% end %>
 
 <% if rspec_files_per_test_level[:background_migration][:files].size > 0 %>
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 12bbad1bc62..9c2b0406f02 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -76,7 +76,7 @@ include:
     # spec/lib, yet background migration tests are also sitting there,
     # and they should run on their own jobs so we don't need to run them
     # in unit tests again.
-    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration"
+    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house"
   after_script:
     - echo -e "\e[0Ksection_start:`date +%s`:report_results_section[collapsed=true]\r\e[0KReport results"
     - |
@@ -110,7 +110,7 @@ include:
 .rspec-base-migration:
   script:
     - !reference [.base-script, script]
-    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt"
+    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~zoekt --tag ~click_house"
   after_script:
     - !reference [.rspec-base, after_script]
 
@@ -129,6 +129,16 @@ include:
     - .rspec-base
     - .use-pg14
 
+.rspec-base-pg14-clickhouse23:
+  extends:
+    - .rspec-base
+    - .use-pg14-clickhouse23
+  script:
+    - cp config/click_house.yml.example config/click_house.yml
+    - 'sed -i "s|url:.*$|url: http://clickhouse:8123|g" config/click_house.yml'
+    - !reference [.base-script, script]
+    - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag click_house"
+
 .rspec-base-pg14-as-if-foss:
   extends:
     - .rspec-base
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 5df4d7a5fe5..295f22258e9 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2066,6 +2066,11 @@
       changes: *code-backstage-patterns
       when: always
 
+.rails:rules:clickhouse-changes:
+  rules:
+    - <<: *if-merge-request
+      changes: ["**/*click_house*"]
+
 #########################
 # Static analysis rules #
 #########################