gitlab-qa 15.4.0 → 15.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f1e475ea2c0271c08caf2de2d91881fb387148ee9a0686922e5c13905dfbae9
-  data.tar.gz: aecf00278bb4ae18d9a4b0b3e1d42d80f3a9b5482a38d755c83a2fa0fc3046ef
+  metadata.gz: b800bf0843ad8f6c636de6f83713ed9c6c631d90d4140ce14670e88af7228be9
+  data.tar.gz: 90b75c71cd03df92f810505e5f1c920845f482d508aff47fdd9a40041cfe9521
 SHA512:
-  metadata.gz: 164f25be24c4f6800d9dbb150776876a38e85c5bebcac4a72f449a0ed8e6ac2b65b89502cff82c588f101b6a9b299f3fbc2735f99d4a829990e85cdf5fc5674d
-  data.tar.gz: f1bbdd00cb493f5f6cb0a4f48af319503e3526515f12edceb631868194183e0910b08cedbdbf9e92f59177a7632a63b459bef681555b806eecf72bd6def571a7
+  metadata.gz: 6b73f4e3a80917e77422b1a49ce6e2c2ea6525d9c5bc6ceac42495e781baa555ba2b96b2f22bee9bef7eeaa5def8053758ae71ee762bba046674a75015e2d06e
+  data.tar.gz: ef66c9ed5786f1cc3bc2d31b6b75929c94a3737ed1af492b5d73992c2f0fa63f08d5726da3c69ba6485f8892c7e8b0b0c9d61ceedbdf655b30a4fc3fafcd56f1

data/.gitlab/ci/omnibus.gitlab-ci.yml

@@ -0,0 +1,15 @@
+include:
+  - project: gitlab-org/gitlab
+    ref: master
+    file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
+
+# Override git strategy because pipeline template is designed to install 'gitlab-qa' from rubygems and thus does not require
+# cloning the project, yet here we need to clone repo to run 'gitlab-qa' with all local changes
+
+cache-gitlab-qa:
+  variables:
+    GIT_STRATEGY: clone
+
+.omnibus-e2e:
+  variables:
+    GIT_STRATEGY: clone

data/.gitlab/ci/versions.yml

@@ -0,0 +1,6 @@
+variables:
+  DEBIAN_VERSION: bookworm
+  DOCKER_VERSION: "24.0.5"
+  RUBY_VERSION: "3.3.7"
+  RUBYGEMS_VERSION: "3.6"
+  GIT_VERSION: "2.49"

data/.gitlab-ci.yml

@@ -8,9 +8,10 @@
     - vendor/ruby
 
 include:
+  - local: .gitlab/ci/versions.yml
   - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@1.4.0
     inputs:
-      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}"
+      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/ci/debian-${DEBIAN_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}"
       job_stage: "check"
   - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 
@@ -21,7 +22,7 @@ stages:
   - deploy
 
 default:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}
+  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/ci/debian-${DEBIAN_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -42,9 +43,6 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
 variables:
-  DEBIAN_VERSION: bookworm
-  DOCKER_VERSION: "24.0.5"
-  RUBY_VERSION: "3.1.5"
   BUNDLE_PATH: vendor
   BUNDLE_SILENCE_ROOT_WARNING: "true"
   BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
@@ -55,7 +53,7 @@ variables:
     - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/)'
       changes: ["lib/**/version.rb"]
 
-package-and-test-env:
+test-on-omnibus-env:
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:latest
   stage: .pre
   variables:
@@ -71,11 +69,13 @@ package-and-test-env:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
       variables:
         UPDATE_QA_CACHE: "true"
     - if: '$CI_MERGE_REQUEST_IID'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
       variables:
         UPDATE_QA_CACHE: "true"
     - when: always
@@ -94,9 +94,11 @@ cache-gems:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
     - if: '$CI_MERGE_REQUEST_IID'
       changes:
         - Gemfile.lock
+        - .gitlab/ci/versions.yml
 
 danger-review:
   needs:
@@ -125,10 +127,10 @@ rspec:
         coverage_format: cobertura
         path: coverage/coverage.xml
 
-package-and-test:
+test-on-omnibus:
   stage: qa
   needs:
-    - package-and-test-env
+    - test-on-omnibus-env
   variables:
     RELEASE: EE
     RUN_WITH_BUNDLE: "true"
@@ -136,25 +138,23 @@ package-and-test:
     SKIP_REPORT_IN_ISSUES: "true"
     UPDATE_QA_CACHE: $UPDATE_QA_CACHE
     GITLAB_QA_CACHE_KEY: $GITLAB_QA_CACHE_KEY
-    QA_RETRY_FAILED_SPECS: "true"
+    RUN_ALL_TESTS: "true"
+    QA_PATH: "."
+    QA_RETRY_FAILED_SPECS: "false" # do not retry test failures as gitlab-qa mostly affect deploy part only
     QA_RUN_TYPE: gitlab-qa
     QA_EXPORT_TEST_METRICS: "false" # skip metrics export as this pipeline is only used to validate gitlab-qa changes
   inherit:
     variables:
       - RUBY_VERSION
       - DEBIAN_VERSION
-      - DOCKER_VERSION
   trigger:
+    include: .gitlab/ci/omnibus.gitlab-ci.yml
     strategy: depend
     forward:
       yaml_variables: true
       pipeline_variables: true
-    include:
-      - project: gitlab-org/gitlab
-        ref: master
-        file: .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
   rules:
     - if: '$CI_MERGE_REQUEST_IID'
       when: manual
       allow_failure: true
-    - when: always
+    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/'

data/.rubocop_todo.yml

@@ -54,7 +54,6 @@ Metrics/AbcSize:
     - 'lib/gitlab/qa/scenario/test/integration/registry_tls.rb'
     - 'lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb'
     - 'lib/gitlab/qa/scenario/test/integration/smtp.rb'
-    - 'lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb'
 
 # Offense count: 2
 # Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (15.4.0)
+    gitlab-qa (15.6.0)
       activesupport (>= 6.1, < 7.2)
       ffi (~> 1.17)
       gitlab (~> 4.19)

data/docs/what_tests_can_be_run.md

@@ -56,8 +56,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `CHROME_DISABLE_DEV_SHM` | `false` | Set to `true` to disable `/dev/shm` usage in Chrome on Linux. | No|
 | `QA_ADDITIONAL_REPOSITORY_STORAGE` |-  | The name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario.  Note: Admin access is required to change repository storage. | No|
 | `QA_PRAEFECT_REPOSITORY_STORAGE` |-  | The name of repository storage using Praefect. Note: Admin access is required to change repository storage. | No|
-| `QA_COOKIES` |-  | Optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true". | No|
-| `QA_DEBUG` |-  | Set to `true` to verbosely log page object actions. Note: if enabled be aware that sensitive data might be logged. If an input element has a QA selector with `password` in the name, data entered into the input element will be masked. If the element doesn't have `password` in its name it won't be masked. | No|
+| `QA_COOKIES` |-  | Optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true", or to use a different cell e.g. "_gitlab_session=cell-2-please". | No|
 | `QA_LOG_LEVEL` | `info` | Logging level to use for gitlab-qa output and qa tests output | No|
 | `QA_LOG_PATH` | `QA_ARTIFACTS_DIR` | Path to output debug logging to. | No|
 | `QA_CAN_TEST_GIT_PROTOCOL_V2` | `true` | Set to `false` to skip tests that require Git protocol v2 if your environment doesn't support it. | No|
@@ -864,6 +863,19 @@ $ export QA_PRAEFECT_REPOSITORY_STORAGE="nfs-file22"
 $ gitlab-qa Test::Instance::Staging -- --tag smoke
 ```
 
+#### Testing Against Different Cells
+
+When running tests against GitLab instances that use a [cells architecture](https://docs.gitlab.com/ee/architecture/blueprints/cells/), you can target specific cells by setting the GitLab session cookie. This is useful for testing cell-specific functionality or debugging issues within a particular cell.
+
+To direct tests to a specific cell, use the `QA_COOKIES` environment variable to set the `_gitlab_session` cookie with the target cell identifier:
+
+```shell
+$ export QA_COOKIES="_gitlab_session=cell-2-please"
+$ gitlab-qa Test::Instance::Staging
+```
+
+**Note:** The actual cell identifiers depend on your GitLab instance configuration. Check with your GitLab administrator for the correct cell names in your environment.
+
 ### `Test::Instance::StagingRef`
 
 This scenario tests that the [`Staging Ref`](https://staging-ref.gitlab.com)

data/lib/gitlab/qa/component/base.rb

@@ -176,6 +176,10 @@ module Gitlab
           exec_commands.each { |command| docker.exec(name, command) }
         end
 
+        def get_reconfigure_log_file_from_artifact
+          nil
+        end
+
         private
 
         attr_reader :exec_commands, :wait_until_ready, :reconfigure
@@ -200,7 +204,7 @@ module Gitlab
             wait_until_ready
             process_exec_commands
           rescue Support::ShellCommand::StatusError => e
-            reconfigure_log_file = get_reconfigure_log_file_from_artefact
+            reconfigure_log_file = get_reconfigure_log_file_from_artifact
             # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
             if (retries += 1) < 3
               unless reconfigure_log_file.nil?

data/lib/gitlab/qa/component/gitaly.rb

@@ -68,15 +68,16 @@ module Gitlab
               'listen_addr': '0.0.0.0:#{gitaly_port}',
               'prometheus_listen_addr': '0.0.0.0:9236',
               'auth_token': 'PRAEFECT_INTERNAL_TOKEN',
-              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}}
+              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}},
+              storage: [
+                          {
+                            name: '#{name}',
+                            path: '/var/opt/gitlab/git-data/repositories',
+                          },
+                        ]
             }
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';
-            git_data_dirs({
-              '#{name}' => {
-                'path' => '/var/opt/gitlab/git-data'
-              }
-            });
           OMNIBUS
         end
       end

data/lib/gitlab/qa/component/gitlab.rb

@@ -213,7 +213,7 @@ module Gitlab
           log_file
         end
 
-        def get_reconfigure_log_file_from_artefact
+        def get_reconfigure_log_file_from_artifact
           all_reconfigure_log_file = Dir["#{Runtime::Env.host_artifacts_dir}/*reconfigure.log"].sort_by { |f| File.mtime(f) }
           all_reconfigure_log_file.last
         end
@@ -229,7 +229,7 @@ module Gitlab
 
             if line.include?('There was an error running gitlab-ctl reconfigure')
               Runtime::Logger.error(
-                "Failure while running gitlab-ctl reconfigure command. Please check the #{log_file_path} in the artefact for more info"
+                "Failure while running gitlab-ctl reconfigure command. Please check the #{log_file_path} artifact for more info"
               )
             end
 

data/lib/gitlab/qa/component/specs.rb

@@ -60,19 +60,21 @@ module Gitlab
 
           docker_pull_qa_image_if_needed
 
-          Runtime::Logger.info("Running test suite `#{suite}` for #{release.project_name}")
-
           name = "#{release.project_name}-qa-#{SecureRandom.hex(4)}"
-          run_specs(name)
-        rescue Support::ShellCommand::StatusError => e
-          raise e unless retry_failed_specs
 
-          Runtime::Logger.warn("Initial test run failed, attempting to retry failed specs in new process!")
-          results_file = File.join(host_artifacts_dir(name), LAST_RUN_FILE)
-          raise e unless valid_last_run_file?(results_file)
+          begin
+            Runtime::Logger.info("Running test suite `#{suite}` for #{release.project_name}")
+            run_specs(name)
+          rescue Support::ShellCommand::StatusError => e
+            raise e unless retry_failed_specs
+
+            Runtime::Logger.warn("Initial test run failed, attempting to retry failed specs in new process!")
+            results_file = File.join(host_artifacts_dir(name), LAST_RUN_FILE)
+            raise e unless valid_last_run_file?(results_file)
 
-          Runtime::Logger.debug("Found initial run results file '#{results_file}', retrying failed specs!")
-          run_specs(name, retry_process: true, initial_run_results_host_path: results_file)
+            Runtime::Logger.debug("Found initial run results file '#{results_file}', retrying failed specs!")
+            run_specs(name, retry_process: true, initial_run_results_host_path: results_file)
+          end
         end
 
         def suite=(suite)
@@ -156,9 +158,19 @@ module Gitlab
         end
 
         def docker_pull_qa_image_if_needed
-          @docker.login(**release.login_params) if release.login_params
+          if release.login_params
+            begin
+              @docker.login(**release.login_params)
+            rescue Support::ShellCommand::StatusError => e
+              raise "Failed to login to Docker registry: #{e.message}"
+            end
+          end
 
-          @docker.pull(image: qa_image) unless Runtime::Env.skip_pull?
+          begin
+            @docker.pull(image: qa_image) unless Runtime::Env.skip_pull?
+          rescue Support::ShellCommand::StatusError => e
+            raise "Failed to pull gitlab-qa image: #{e.message}"
+          end
         end
 
         def args_with_flags(feature_flag_set, retry_process: false)

data/lib/gitlab/qa/runtime/env.rb

@@ -107,7 +107,6 @@ module Gitlab
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
           'QA_COOKIES' => :qa_cookie,
-          'QA_DEBUG' => :qa_debug,
           'QA_DOCKER_NETWORK' => :docker_network,
           'QA_EXPORT_TEST_METRICS' => :qa_export_test_metrics,
           'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
@@ -167,8 +166,7 @@ module Gitlab
           'WORKSPACES_OAUTH_SIGNING_KEY' => :workspaces_oauth_signing_key,
           'WORKSPACES_PROXY_DOMAIN' => :workspaces_proxy_domain,
           'WORKSPACES_WILDCARD_CERT' => { name: :workspaces_wildcard_cert, type: :file },
-          'WORKSPACES_WILDCARD_KEY' => { name: :workspaces_wildcard_key, type: :file },
-          'EPIC_SYNC_TEST' => :epic_sync_test
+          'WORKSPACES_WILDCARD_KEY' => { name: :workspaces_wildcard_key, type: :file }
         }.freeze
 
         def variables
@@ -177,14 +175,8 @@ module Gitlab
             value ||= send(method_name) # rubocop:disable GitlabSecurity/PublicSend
             vars[env_var_name] = value if value
           end
-          qa_variables = ENV.each_with_object({}) do |(name, _value), vars|
-            next unless name.start_with?('QA_')
 
-            var_name = env_var_name_if_defined(name)
-            vars[name] = var_name if var_name
-          end
-
-          qa_variables.merge(defined_variables)
+          qa_ci_variables.merge(defined_variables)
         end
 
         def admin_password
@@ -199,10 +191,6 @@ module Gitlab
           variables.select { |k, _| ENV_VARIABLES[k].is_a?(Hash) && ENV_VARIABLES[k][:type] == :file }.values
         end
 
-        def debug?
-          enabled?(ENV.fetch('QA_DEBUG', nil), default: true)
-        end
-
         def log_level
           env_var_value_if_defined('QA_LOG_LEVEL')&.upcase || 'INFO'
         end
@@ -486,6 +474,16 @@ module Gitlab
 
         private
 
+        def qa_ci_variables
+          prefixes = %w[QA_ GLCI_]
+          ENV.each_with_object({}) do |(name, _value), vars|
+            next unless prefixes.any? { |prefix| name.start_with?(prefix) }
+
+            var_name = env_var_name_if_defined(name)
+            vars[name] = var_name if var_name
+          end
+        end
+
         def enabled?(value, default: true)
           return default if value.nil?
 

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -102,12 +102,12 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{iptables_restricted_network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
-                });
+                };
                 gitaly['enable'] = false;
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [

data/lib/gitlab/qa/scenario/test/instance/any.rb

@@ -14,6 +14,7 @@ module Gitlab
               Component::Specs.perform do |specs|
                 specs.suite = 'Test::Instance::All'
                 specs.release = QA::Release.new(edition_and_tag)
+                specs.network = Runtime::Env.docker_network if ENV['QA_DOCKER_NETWORK']
                 specs.args = [address, *rspec_args]
               end
             end

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb

@@ -47,20 +47,19 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://gitlab.test';
 
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://praefect.test:2305',
-                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                gitlab_rails['repositories_storages'] = {
+                  "default" => {
+                    "gitaly_address" => "tcp://praefect.test:2305",
+                    "gitaly_token" => "PRAEFECT_EXTERNAL_TOKEN"
                   },
-                  'gitaly' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/gitaly'
+                  "gitaly" => {
+                    "gitaly_address" => "tcp://gitlab.test:8075"
                   },
-                  'secondary' => {
-                    'gitaly_address' => 'tcp://gitlab.test:8075',
-                    'path' => '/var/opt/gitlab/git-data/secondary'
+                  "secondary" => {
+                    "gitaly_address" => "tcp://gitlab.test:8075"
                   }
-                });
+                };
+
                 gitaly['enable'] = true;
                 gitaly['configuration'] = {
                   auth: {
@@ -70,11 +69,11 @@ module Gitlab
                   storage: [
                     {
                       name: 'gitaly',
-                      path: '/var/opt/gitlab/git-data/gitaly',
+                      path: '/var/opt/gitlab/git-data/gitaly/repositories',
                     },
                     {
                       name: 'secondary',
-                      path: '/var/opt/gitlab/git-data/secondary',
+                      path: '/var/opt/gitlab/git-data/secondary/repositories',
                     },
                   ],
                 };

data/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

@@ -51,12 +51,12 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{config.network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
-                });
+                };
                 gitaly['enable'] = false;
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [

data/lib/gitlab/qa/scenario/test/integration/mtls.rb

@@ -73,10 +73,14 @@ module Gitlab
                 gitlab_rails['gitaly_token'] = 'abc123secret';
                 gitlab_shell['secret_token'] = 'shellsecret';
 
-                git_data_dirs({
-                  'default' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' },
-                  'storage1' => { 'gitaly_address' => 'tls://#{@gitaly_name}.#{@network}:9999' },
-                });
+                gitlab_rails['repositories_storages'] = {
+                  'default' => {
+                    'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999"
+                  },
+                  'storage1' => {
+                    'gitaly_address' => "tls://#{@gitaly_name}.#{@network}:9999"
+                  }
+                }
               OMNIBUS
             end
 
@@ -118,11 +122,6 @@ module Gitlab
                 gitlab_shell['secret_token'] = 'shellsecret';
 
                 gitlab_rails['internal_api_url'] = 'https://#{@gitlab_name}.#{@network}';
-
-                git_data_dirs({
-                  'default' => { 'path' => '/var/opt/gitlab/git-data' },
-                  'storage1' => { 'path' => '/mnt/gitlab/git-data' },
-                })
               OMNIBUS
             end
           end

data/lib/gitlab/qa/scenario/test/integration/praefect.rb

@@ -19,16 +19,16 @@ module Gitlab
               <<~OMNIBUS
                 external_url 'http://#{config.gitlab_name}.#{config.network}';
 
-                git_data_dirs({
+                gitlab_rails['repositories_storages'] = {
                   'default' => {
-                    'gitaly_address' => 'tcp://#{config.praefect_addr}:#{config.praefect_port}',
+                    'gitaly_address' => "tcp://#{config.praefect_addr}:#{config.praefect_port}",
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   },
                   'gitaly' => {
-                    'gitaly_address' => 'tcp://#{config.gitlab_name}.#{config.network}:8075',
-                    'path' => '/var/opt/gitlab/git-data'
+                    'gitaly_address' => "tcp://#{config.gitlab_name}.#{config.network}:8075"
                   }
-                });
+                }
+
                 gitaly['enable'] = true;
                 gitaly['configuration'] = {
                   auth: {

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '15.4.0'
+    VERSION = '15.6.0'
   end
 end

data/rubocop/cop/gitlab/dangerous_interpolation.rb

@@ -38,7 +38,6 @@ module RuboCop
           'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
           'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
-          'QA_DEBUG' => :qa_debug,
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 15.4.0
+  version: 15.6.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-16 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -354,6 +354,8 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/changelog_config.yml"
+- ".gitlab/ci/omnibus.gitlab-ci.yml"
+- ".gitlab/ci/versions.yml"
 - ".gitlab/issue_templates/Default.md"
 - ".gitlab/merge_request_templates/Default.md"
 - ".gitlab/merge_request_templates/Release.md"
@@ -425,7 +427,6 @@ files:
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/component/staging_ref.rb
-- lib/gitlab/qa/component/suggested_reviewer.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
 - lib/gitlab/qa/docker/volumes.rb
@@ -494,7 +495,6 @@ files:
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
-- lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb
 - lib/gitlab/qa/scenario/test/omnibus/update_from_previous_ai.rb
@@ -517,11 +517,6 @@ files:
 - scripts/build-package-and-test-env
 - support/data/admin_access_token_seed.rb
 - support/data/license_usage_seed.rb
-- support/manifests/suggested_reviewer/authenticator.yaml
-- support/manifests/suggested_reviewer/postgres.yaml
-- support/manifests/suggested_reviewer/pubsub.yaml
-- support/manifests/suggested_reviewer/recommender-bot.yaml
-- support/manifests/suggested_reviewer/recommender.yaml
 - support/pipeline/create_for_projectname.rb
 - support/setup/gitlab_duo_setup.rb
 - tls_certificates/authority/ca.crt

data/lib/gitlab/qa/component/suggested_reviewer.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Component
-      class SuggestedReviewer
-        include Scenario::Actable
-
-        # Source: https://gitlab.com/gitlab-org/modelops/applied-ml/review-recommender/cluster-management
-        MANIFESTS_PATH = File.expand_path('../../../../support/manifests/suggested_reviewer', __dir__)
-
-        def initialize
-          @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3d)
-        end
-
-        def name
-          @name ||= "suggested_reviewer"
-        end
-
-        def prepare
-          @cluster.create_registry_mirror
-        end
-
-        def create_cluster
-          @cluster.create!
-        end
-
-        def deploy_services
-          Dir.glob(File.join(MANIFESTS_PATH, '**/*')).each do |file|
-            Runtime::Logger.info("Applying manifest #{file}")
-            @cluster.apply_manifest(File.read(file))
-          end
-        end
-
-        def teardown
-          @cluster.remove!
-        end
-
-        def wait_until_ready; end
-
-        def teardown?
-          !Runtime::Scenario.attributes.include?(:teardown) || Runtime::Scenario.teardown
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class SuggestedReviewer < Scenario::Template
-            attr_reader :spec_suite
-
-            def initialize
-              @spec_suite = 'Test::Instance::All'
-              @network = Runtime::Env.docker_network
-              @env = {}
-              @tag = 'suggested_reviewer'
-              @gitlab_name = 'gitlab-suggested-reviewer'
-            end
-
-            def perform(release, *rspec_args)
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = QA::Release.new(release)
-                gitlab.name = @gitlab_name
-                gitlab.network = @network
-
-                gitlab.instance do
-                  # Wait for the suggested reviewer services to be ready before attempting to run specs
-                  @cluster = suggested_reviewer_cluster
-                  @cluster.wait_until_ready
-
-                  Runtime::Logger.info('Running Suggested Reviewer specs!')
-
-                  if @tag
-                    rspec_args << "--" unless rspec_args.include?('--')
-                    rspec_args << "--tag" << @tag
-                  end
-
-                  Component::Specs.perform do |specs|
-                    specs.suite = spec_suite
-                    specs.release = gitlab.release
-                    specs.network = gitlab.network
-                    specs.args = [gitlab.address, *rspec_args]
-                    specs.env = @env
-                  end
-                end
-              end
-            ensure
-              @cluster&.teardown if @cluster&.teardown?
-            end
-
-            def suggested_reviewer_cluster
-              Component::SuggestedReviewer.new.tap do |sr|
-                sr.prepare
-                sr.create_cluster
-                sr.deploy_services
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/support/manifests/suggested_reviewer/authenticator.yaml

@@ -1,41 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: authenticator-deployment
-  labels:
-    app: authenticator
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: authenticator
-  template:
-    metadata:
-      labels:
-        app: authenticator
-    spec:
-      imagePullSecrets:
-        - name: gitlab-registry
-      containers:
-        - name: authenticator
-          image: registry.gitlab.com/gitlab-org/modelops/applied-ml/review-recommender/authenticator:0.1.0
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
-          args: []
-          env:
-            - name: AUTHENTICATOR_SERVICE_PORT
-              value: "8080"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: authenticator-service
-spec:
-  type: NodePort
-  ports:
-    - port: 8080
-      targetPort: 8080
-  selector:
-    app: authenticator

data/support/manifests/suggested_reviewer/postgres.yaml

@@ -1,84 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: postgres-secret
-type: kubernetes.io/basic-auth
-stringData:
-  username: reviewer-recommender
-  password: ml4dawin
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: postgres-pvc
-spec:
-  storageClassName: local-path
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: postgres-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: postgres
-  template:
-    metadata:
-      labels:
-        app: postgres
-    spec:
-      containers:
-        - name: postgres
-          image: postgres:13-alpine
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 5432
-          volumeMounts:
-            - name: postgres-pv
-              mountPath: /var/lib/postgresql/data
-              subPath: postgres
-          resources:
-            limits:
-              memory: 256Mi
-              cpu: 250m
-          env:
-            - name: POSTGRES_DB
-              value: reviewer-recommender
-            - name: POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: username
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: password
-      volumes:
-        - name: postgres-pv
-          persistentVolumeClaim:
-            claimName: postgres-pvc
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: postgres
-  labels:
-    app: postgres
-spec:
-  type: ClusterIP
-  selector:
-    app: postgres
-  ports:
-    - port: 5432
-      targetPort: 5432

data/support/manifests/suggested_reviewer/pubsub.yaml

@@ -1,41 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pubsub-deployment
-  labels:
-    app: pubsub
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: pubsub
-  template:
-    metadata:
-      labels:
-        app: pubsub
-    spec:
-      containers:
-        - name: pubsub
-          image: singularities/pubsub-emulator:latest
-          imagePullPolicy: IfNotPresent
-          env:
-            - name: PUBSUB_PROJECT_ID
-              value: project-test
-            - name: PUBSUB_LISTEN_ADDRESS
-              value: 0.0.0.0:8432
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pubsub
-  labels:
-    app: pubsub
-spec:
-  type: ClusterIP
-  selector:
-    app: pubsub
-  ports:
-    - port: 8432
-      targetPort: 8432

data/support/manifests/suggested_reviewer/recommender-bot.yaml

@@ -1,242 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gcp-credentials
-type: Opaque
-data:
-  gcp_json: "ewogICJjbGllbnRfaWQiOiAiMTIzNDU2Nzg5YWJjZGVmZy5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsCiAgImNsaWVudF9zZWNyZXQiOiAiZC1GTHlld3VxeWV1cXciLAogICJxdW90YV9wcm9qZWN0X2lkIjogInN1Z2dlc3RlZC1yZXZpZXdlci0xNTA0MDBlNiIsCiAgInJlZnJlc2hfdG9rZW4iOiAiMS8vMTIzNDU2NzhhYmNkZWZnIiwKICAidHlwZSI6ICJhdXRob3JpemVkX3VzZXIiCn0K"
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: recommender-bot-envoy-sidecar-config
-  labels:
-    app: recommender-bot
-data:
-  envoy.yaml: |
-    static_resources:
-      listeners:
-        - name: "recommender-bot-http-listener"
-          address:
-            socket_address: { address: "0.0.0.0", port_value: 8282 }
-          filter_chains:
-            - filters:
-              - name: "envoy.filters.network.http_connection_manager"
-                typed_config:
-                  "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-                  stat_prefix: "grpc_json"
-                  codec_type: "AUTO"
-                  route_config:
-                    name: "local_route"
-                    virtual_hosts:
-                      - name: "local_service"
-                        domains: [ "*" ]
-                        routes:
-                          - match: { prefix: "/", grpc: {} }
-                            route: { cluster: "recommender-bot", timeout: 60s }
-                  http_filters:
-                    - name: "envoy.filters.http.grpc_json_transcoder"
-                      typed_config:
-                        "@type": type.googleapis.com/envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder
-                        proto_descriptor: "/data/protos/recommender-bot.protoset.pb"
-                        services: [ "bot.RecommenderService" ]
-                        print_options:
-                          add_whitespace: true
-                          always_print_primitive_fields: true
-                          always_print_enums_as_ints: false
-                          preserve_proto_field_names: false
-                        convert_grpc_status: true
-                        request_validation_options:
-                          reject_unknown_method: true
-                          reject_unknown_query_parameters: true
-                    - name: "envoy.filters.http.router"
-        - name: "recommender-bot-http-auth-listener"
-          address:
-            socket_address: { address: "0.0.0.0", port_value: 8484 }
-          filter_chains:
-            - filters:
-              - name: "envoy.filters.network.http_connection_manager"
-                typed_config:
-                  "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-                  stat_prefix: "grpc_json"
-                  codec_type: "AUTO"
-                  route_config:
-                    name: "local_route"
-                    virtual_hosts:
-                      - name: "local_service"
-                        domains: [ "*" ]
-                        routes:
-                          - match: { prefix: "/", grpc: {} }
-                            route: { cluster: "recommender-bot", timeout: 60s }
-                  http_filters:
-                    - name: "envoy.filters.http.grpc_json_transcoder"
-                      typed_config:
-                        "@type": type.googleapis.com/envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder
-                        proto_descriptor: "/data/protos/recommender-bot.protoset.pb"
-                        services: [ "bot.RecommenderService" ]
-                        print_options:
-                          add_whitespace: true
-                          always_print_primitive_fields: true
-                          always_print_enums_as_ints: false
-                          preserve_proto_field_names: false
-                        convert_grpc_status: true
-                        request_validation_options:
-                          reject_unknown_method: true
-                          reject_unknown_query_parameters: true
-                    - name: "envoy.filters.http.ext_authz"
-                      typed_config:
-                        "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
-                        http_service:
-                          server_uri:
-                            uri: "http://authenticator-service:8080"
-                            cluster: "ext-auth"
-                            timeout: 60s
-                          authorization_request:
-                            allowed_headers:
-                              patterns:
-                                - { exact: "Job-Token", ignore_case: true }
-                                - { exact: "Project-Id", ignore_case: true }
-                        failure_mode_allow: false
-                    - name: "envoy.filters.http.router"
-
-      clusters:
-        - name: "recommender-bot"
-          connect_timeout: "1.25s"
-          type: "STATIC"
-          lb_policy: "ROUND_ROBIN"
-          dns_lookup_family: V4_ONLY
-          typed_extension_protocol_options:
-            envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
-              "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
-              explicit_http_config:
-                http2_protocol_options: { }
-          load_assignment:
-            cluster_name: "recommender-bot"
-            endpoints:
-              - lb_endpoints:
-                  - endpoint:
-                      address:
-                        socket_address:
-                          address: "127.0.0.1"
-                          port_value: 8080
-        - name: "ext-auth"
-          connect_timeout: "1.25s"
-          type: "LOGICAL_DNS"
-          lb_policy: "ROUND_ROBIN"
-          load_assignment:
-            cluster_name: "ext-auth"
-            endpoints:
-              - lb_endpoints:
-                  - endpoint:
-                      address:
-                        socket_address:
-                          address: "authenticator-service"
-                          port_value: 8080
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: recommender-bot-deployment
-  labels:
-    app: recommender-bot
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: recommender-bot
-  template:
-    metadata:
-      labels:
-        app: recommender-bot
-    spec:
-      initContainers:
-        - name: protosets
-          image: recommender-bot-service:dev
-          imagePullPolicy: Never
-          command: [sh, -c]
-          args: [cp /app/recommender-bot.protoset.pb /data/protos]
-          volumeMounts:
-            - name: grpc-protosets
-              mountPath: /data/protos
-      containers:
-        - name: recommender-bot-envoy-sidecar
-          image: envoyproxy/envoy-alpine:v1.19-latest
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 8282
-            - containerPort: 8484
-          volumeMounts:
-            - name: recommender-bot-envoy-sidecar-config
-              mountPath: /etc/envoy
-            - name: grpc-protosets
-              mountPath: /data/protos
-              readOnly: true
-        - name: recommender-bot
-          image: recommender-bot-service:dev
-          imagePullPolicy: Never
-          ports:
-            - containerPort: 8080
-          env:
-            - name: RECOMMENDER_BOT_SERVICE_PORT
-              value: "8080"
-            - name: RECOMMENDER_BOT_GITLAB_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: recommender-bot-gitlab-token
-                  key: token
-            - name: RECOMMENDER_BOT_GRPC_SERVICE_URL
-              value: recommender-service:8080
-            - name: RECOMMENDER_BOT_PG_CONN_STRING
-              valueFrom:
-                secretKeyRef:
-                  name: recommender-bot-pg-conn-string
-                  key: pg-conn
-            - name: PUBSUB_EMULATOR_HOST
-              value: pubsub:8432
-            - name: GOOGLE_APPLICATION_CREDENTIALS
-              value: /data/gcp/gcp_credentials.json
-            - name: RECOMMENDER_BOT_PUBSUB_PROJECT_ID
-              value: project-test
-            - name: RECOMMENDER_BOT_PUBSUB_TOPIC_RECOMMENDATIONS
-              value: gitlab.merge-request-recommendations-test.1
-          volumeMounts:
-            - name: gcp-secrets
-              mountPath: /data/gcp
-              readOnly: true
-      volumes:
-        - name: grpc-protosets
-          emptyDir: {}
-        - name: recommender-bot-envoy-sidecar-config
-          configMap:
-            name: recommender-bot-envoy-sidecar-config
-        - name: gcp-secrets
-          secret:
-            secretName: gcp-credentials
-            items:
-              - key: gcp_json
-                path: gcp_credentials.json
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: recommender-bot-service
-  labels:
-    app: recommender-bot
-spec:
-  type: NodePort
-  ports:
-    - name: http-plain
-      port: 8282
-      targetPort: 8282
-    - name: http-auth
-      port: 8484
-      targetPort: 8484
-    - name: grpc
-      port: 8080
-      targetPort: 8080
-  selector:
-    app: recommender-bot

data/support/manifests/suggested_reviewer/recommender.yaml

@@ -1,52 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: recommender-deployment
-  labels:
-    app: recommender
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: recommender
-  template:
-    metadata:
-      labels:
-        app: recommender
-    spec:
-      containers:
-        - name: recommender
-          image: recommender-service:dev
-          imagePullPolicy: Never
-          ports:
-            - containerPort: 8080
-          volumeMounts:
-            - name: models-mount
-              mountPath: /app/data/models
-          env:
-            - name: RECOMMENDER_SERVICE_PORT
-              value: "8080"
-            - name: RECOMMENDER_MODELS_STORAGE
-              value: local
-            - name: GRPC_VERBOSITY
-              value: debug
-      volumes:
-        - name: models-mount
-          hostPath:
-            path: /tmp/gitlab-qa/suggested_reviewer/data/models
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: recommender-service
-  labels:
-    app: recommender
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8080
-      targetPort: 8080
-  selector:
-    app: recommender