gitlab-qa 7.29.0 → 7.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4ca3feba042298fe467133b5f576653b553af61ac01a0b72a1a970917e3711
-  data.tar.gz: 61ee29dbe4355bcbc18d8e164b97f1453c461419fcf6bd70543a659e5029d333
+  metadata.gz: 950731b29895b80ed3a174ade472d58c7496fc60620959224790f007a0beff79
+  data.tar.gz: 66d92f34024e8c9a4b679424c0f1994713ac7180eadd875f732d8c4d8f741a9b
 SHA512:
-  metadata.gz: 5ddff780b5188c489bec89ce0b475096ac707f9e2e5138cc400efeef9fbd576b4c5bebc77f43af207109503e08e1c1efaf2813e3666bd9d88d5807f7c9691891
-  data.tar.gz: 34b7eacbd20c81f264aaf478f35e9ed78d5c7e185b18178bd55fa1c5fc37b0053f54bd49027d994cf91d6d69120c3371fdb818727419c17ef10ea7f373a4c91d
+  metadata.gz: fab55c1cfbcaa92e9b24156a61d1314e28565be51c1d0e06387445554f25dd1f170f192d2784a2d1bd40d7ff28de484ceba9830bcb16dd1d792a11c2253171c8
+  data.tar.gz: 663d5d28fa646a0b19ac84b292b61879b8ebc238657d99928d10ffee995dfc12dd56419cfbdd5cf1b9384c665dc6e54cedde4136c2b32fd4810982821f2cd4af

data/.gitignore

@@ -8,6 +8,9 @@
 /.idea
 .ruby-version
 .ruby-gemset
+.DS_Store
+.rakeTasks
+.tool-versions
 
 # ignore built gems
 *.gem

data/.gitlab/ci/jobs/base.gitlab-ci.yml

@@ -70,6 +70,8 @@ workflow:
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
+  COLORIZED_LOGS: "true"
+  QA_DEBUG: "false"
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
   QA_GENERATE_ALLURE_REPORT: "true"

data/.gitlab/ci/jobs/decomposition_multiple_db.gitlab-ci.yml

@@ -0,0 +1,25 @@
+ce:decomposition_multiple_db:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ce-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
+  parallel: 5
+  variables:
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_multiple_db"
+
+ee:decomposition_multiple_db:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-qa-tests-specified
+    - .test
+    - .ee-variables
+    - .high-capacity
+    - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
+  parallel: 5
+  variables:
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_multiple_db"

data/.gitlab/ci/jobs/{ci_decomposition.gitlab-ci.yml → decomposition_single_db.gitlab-ci.yml}

@@ -1,4 +1,4 @@
-ce:ci_decomposition:
+ce:decomposition_single_db:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .rules:ce-never-when-qa-tests-specified
@@ -9,9 +9,9 @@ ce:ci_decomposition:
     - .combined-gitlab-qa-options-script
   parallel: 5
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_single_db"
 
-ee:ci_decomposition:
+ee:decomposition_single_db:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .rules:ee-never-when-qa-tests-specified
@@ -22,4 +22,4 @@ ee:ci_decomposition:
     - .combined-gitlab-qa-options-script
   parallel: 5
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config decomposition_single_db"

data/.rubocop.yml

@@ -36,3 +36,6 @@ Style/SignalException:
 
 Layout/SpaceBeforeFirstArg:
   Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/.rubocop_todo.yml

@@ -89,11 +89,6 @@ RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
-# Offense count: 221
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 22
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/ExplicitBlockArgument:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (7.29.0)
+    gitlab-qa (7.31.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
@@ -219,7 +219,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webmock (3.7.0)
       addressable (>= 2.3.6)

data/docs/what_tests_can_be_run.md

@@ -712,6 +712,23 @@ in the GitLab project).
   This is used to retrieve the version that staging is currently running.
   This can be found in the shared 1Password vault.
 
+- `GITLAB_USERNAME`: An existing user.
+
+- `GITLAB_PASSWORD`: The user's password.
+
+**Required by specific tests:**
+
+- `QA_PRAEFECT_REPOSITORY_STORAGE`: The name of a Gitaly Cluster storage.
+
+- `GITLAB_ADMIN_USERNAME`: An existing user with administrator access. Required by tests that set feature flags or
+  perform other admin actions.
+
+- `GITLAB_ADMIN_PASSWORD`: The administrator user's password.
+
+- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
+
+- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
+
 **Optional environment variables:**
 
 - `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
@@ -719,17 +736,24 @@ in the GitLab project).
   This is used to pull the QA Docker image from the Omnibus GitLab `dev` Container Registry.
   If the variable isn't present, the QA image from Docker Hub will be used.
   This can be found in the shared 1Password vault.
+  Please note that this variable must be provided when you need to be sure the version of the
+  tests matches the version of GitLab on Staging. If the version from Docker Hub is used it might not include changes deployed to Staging very recently.
 
-Example:
+An example of how to run the smoke tests:
 
 ```
-$ export GITLAB_QA_USER_AGENT="$GITLAB_QA_USER_AGENT"
-$ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
-$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
+$ export GITLAB_QA_USER_AGENT="<value from 1Password>"
+$ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
 $ export GITLAB_USERNAME="gitlab-qa"
-$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
+$ export GITLAB_PASSWORD="<value from 1Password>"
+$ export GITLAB_ADMIN_USERNAME="<value from 1Password>"
+$ export GITLAB_ADMIN_PASSWORD="<value from 1Password>"
+$ export GITLAB_QA_USERNAME_1="gitlab-qa-user1"
+$ export GITLAB_QA_PASSWORD_1="<value from 1Password>"
+$ export QA_PRAEFECT_REPOSITORY_STORAGE="nfs-file22"
 
-$ gitlab-qa Test::Instance::Staging
+$ gitlab-qa Test::Instance::Staging -- --tag smoke
 ```
 
 ### `Test::Instance::StagingRef`
@@ -828,6 +852,52 @@ by setting `QA_COOKIES=gitlab_canary=true`. This adds a cookie
 to all web requests which will result in them being routed
 to the canary fleet.
 
+**Required environment variables:**
+
+- `GITLAB_QA_USER_AGENT`: The browser user-agent to use instead of the default Chrome user-agent.
+  This is needed for the automated tests to bypass the WAF
+
+- `GITLAB_QA_ACCESS_TOKEN`: A valid personal access token with the `api` scope.
+  This is used to retrieve the version that staging is currently running.
+  This can be found in the shared 1Password vault.
+
+- `GITLAB_USERNAME`: An existing user.
+
+- `GITLAB_PASSWORD`: The user's password.
+
+**Required by specific tests:**
+
+- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
+
+- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
+
+**Optional environment variables:**
+
+- `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
+  `gitlab-qa-bot` on `dev.gitlab.org` with the `registry` scope.
+  This is used to pull the QA Docker image from the Omnibus GitLab `dev` Container Registry.
+  If the variable isn't present, the QA image from Docker Hub will be used.
+  This can be found in the shared 1Password vault.
+  Please note that this variable should be provided when you need to be sure the version of the
+  tests matches the version of GitLab on Staging. If the version from Docker Hub is used it might not include changes deployed to Staging very recently.
+
+An example of how to run the smoke tests:
+
+```
+$ export GITLAB_QA_USER_AGENT="<value from 1Password>"
+$ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_USERNAME="gitlab-qa"
+$ export GITLAB_PASSWORD="<value from 1Password>"
+$ export GITLAB_QA_USERNAME_1="gitlab-qa-user1"
+$ export GITLAB_QA_PASSWORD_1="<value from 1Password>"
+$ export QA_CAN_TEST_GIT_PROTOCOL_V2="false"
+$ export QA_CAN_TEST_ADMIN_FEATURES="false"
+$ export QA_CAN_TEST_PRAEFECT="false"
+
+$ gitlab-qa Test::Instance::Production -- --tag smoke
+```
+
 ### `Test::Instance::Preprod`
 
 This scenario functions the same as `Test::Instance::Staging`
@@ -927,12 +997,20 @@ This scenario is a composition of two orchestrated scenarios. It tests the conta
  GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt) gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
  ```
 
-### Test::Instance::Image EE --omnibus-config ci_decomposition
+### Test::Instance::Image EE --omnibus-config decomposition_single_db
+
+This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using a single database:
+
+ ```ruby
+gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_single_db
+ ```
+
+### Test::Instance::Image EE --omnibus-config decomposition_multiple_db
 
-This scenario is to run tests against GitLab instance with [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) on a single Postgres:
+This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using multiple databases:
 
  ```ruby
-gitlab-qa Test::Instance::Image EE --omnibus-config ci_decomposition
+gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_multiple_db
  ```
 
 ### `Test::Instance::Geo EE|<full image address>:nightly|latest|any_tag http://geo-primary.gitlab http://geo-secondary.gitlab`

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

@@ -176,6 +176,7 @@ module Gitlab
           exec_commands << seed_admin_token_command if seed_admin_token
           exec_commands << seed_test_data_command if seed_db
           exec_commands << Runtime::Scenario.omnibus_exec_commands
+          exec_commands << add_git_server_hooks unless Runtime::Scenario.skip_server_hooks
 
           commands = exec_commands.flatten.uniq
           return if commands.empty?
@@ -184,14 +185,17 @@ module Gitlab
           commands.each { |command| @docker.exec(name, command) }
         end
 
-        def sha_version
+        def rails_version
           json = @docker.read_file(
             @release.image, @release.tag,
             '/opt/gitlab/version-manifest.json'
           )
 
           manifest = JSON.parse(json)
-          manifest['software']['gitlab-rails']['locked_version']
+          {
+            sha: manifest['software']['gitlab-rails']['locked_version'],
+            source: manifest['software']['gitlab-rails']['locked_source']['git']
+          }
         end
 
         def copy_key_file(env_key)
@@ -243,6 +247,25 @@ module Gitlab
           ["gitlab-rails runner #{DATA_PATH}/admin_access_token_seed.rb"]
         end
 
+        def add_git_server_hooks
+          global_server_prereceive_hook = <<~SCRIPT
+            #!/usr/bin/env bash
+
+            if [[ \\\$GL_PROJECT_PATH =~ 'reject-prereceive' ]]; then
+              echo 'GL-HOOK-ERR: Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive'
+              exit 1
+            fi
+          SCRIPT
+
+          [
+            @docker.exec(name, 'mkdir -p /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d'),
+            @docker.write_files(name) do |f|
+              f.write('/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/pre-receive.d', global_server_prereceive_hook, false)
+            end,
+            @docker.exec(name, 'chmod +x /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/*')
+          ]
+        end
+
         class Availability
           def initialize(name, relative_path: '', scheme: 'http', protocol_port: 80)
             @docker = Docker::Engine.new

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

@@ -11,7 +11,7 @@ module Gitlab
         attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network, :hostname
 
         def initialize
-          @docker = Docker::Engine.new
+          @docker = Docker::Engine.new(stream_output: true) # stream test output directly instead of through logger
           @volumes = {}
           @env = {}
         end

data/lib/gitlab/qa/docker/command.rb

@@ -2,11 +2,17 @@ module Gitlab
   module QA
     module Docker
       class Command
-        attr_reader :args
+        attr_reader :args, :stream_output
 
-        def initialize(cmd = nil, mask_secrets: nil)
+        # Shell command
+        #
+        # @param [<String, Array>] cmd
+        # @param [<String, Array>] mask_secrets
+        # @param [Boolean] stream_output stream command output to stdout directly instead of logger
+        def initialize(cmd = nil, mask_secrets: nil, stream_output: false)
           @args = Array(cmd)
           @mask_secrets = Array(mask_secrets)
+          @stream_output = stream_output
         end
 
         def <<(*args)

data/lib/gitlab/qa/docker/engine.rb

@@ -7,6 +7,12 @@ module Gitlab
         DOCKER_HOST = ENV['DOCKER_HOST'] || 'http://localhost'
         PRIVILEGED_COMMANDS = [/^iptables.*/].freeze
 
+        attr_reader :stream_output
+
+        def initialize(stream_output: false)
+          @stream_output = stream_output
+        end
+
         def hostname
           URI(DOCKER_HOST).host
         end
@@ -25,7 +31,7 @@ module Gitlab
         end
 
         def run(image:, tag: nil, args: [])
-          Docker::Command.new('run').tap do |command|
+          Docker::Command.new('run', stream_output: stream_output).tap do |command|
             yield command if block_given?
 
             command << full_image_name(image, tag)
@@ -55,8 +61,15 @@ module Gitlab
         def write_files(name)
           exec(name, yield(
             Class.new do
-              def self.write(file, contents)
-                %(echo "#{contents}" > #{file};)
+              # @param file The name of the file
+              # @param contents The content of the file to write
+              # @param expand_vars Set false if you need to write an environment variable '$' to a file. The variable should be escaped \\\$
+              def self.write(file, contents, expand_vars = true)
+                if expand_vars
+                  %(echo "#{contents}" > #{file};)
+                else
+                  %(echo '#{contents}' > #{file};)
+                end
               end
 
               def self.append(file, contents)

data/lib/gitlab/qa/docker/shellout.rb

@@ -17,25 +17,33 @@ module Gitlab
           @logger = Runtime::Logger.logger
         end
 
+        attr_reader :command, :logger
+
         def execute! # rubocop:disable Metrics/AbcSize
           raise StatusError, 'Command already executed' if @output.any?
 
-          @logger.info("Docker shell command: `#{@command.mask_secrets}`".cyan)
+          logger.info("Docker shell command: `#{@command.mask_secrets.cyan}`")
 
           Open3.popen2e(@command.to_s) do |_in, out, wait|
             out.each do |line|
               @output.push(line)
-              print "." unless Runtime::Env.ci # indicate progress for local run
+
+              if stream_progress
+                print "."
+              elsif command.stream_output
+                puts line
+              end
+
               yield line, wait if block_given?
             end
-            puts unless Runtime::Env.ci # add newline after progress dots
+            puts if stream_progress
 
             if wait.value.exited? && wait.value.exitstatus.nonzero?
-              @logger.error("Docker shell command output:\n#{output}")
-              raise StatusError, "Docker command `#{@command.mask_secrets}` failed! ✘"
+              logger.error("Docker shell command output:\n#{output}") unless command.stream_output
+              raise StatusError, "Docker command `#{@command.mask_secrets[0..100]}` failed! ✘"
             end
 
-            @logger.debug("Docker shell command output:\n#{output}") unless output.empty?
+            logger.debug("Docker shell command output:\n#{output}") unless command.stream_output || output.empty?
           end
 
           output
@@ -43,6 +51,13 @@ module Gitlab
 
         private
 
+        # Stream only command execution progress and log output when command finished
+        #
+        # @return [Boolean]
+        def stream_progress
+          !(Runtime::Env.ci || command.stream_output)
+        end
+
         def output
           @output.join.chomp
         end

data/lib/gitlab/qa/report/relate_failure_issue.rb

@@ -210,10 +210,10 @@ module Gitlab
 
           failure = full_stacktrace(test)
 
-          if test.screenshot? && !failure.include?('500 Internal Server Error') && !failure.include?('fabricate_via_api!')
+          if test.screenshot? && !['500 Internal Server Error', 'fabricate_via_api!', 'Error Code 500'].any? { |e| failure.include?(e) }
             relative_url = gitlab.upload_file(file_fullpath: test.failure_screenshot)
 
-            section = "### Screenshot: #{relative_url.markdown}"
+            section = "### Screenshot: #{relative_url.markdown}" if relative_url
           end
 
           section

data/lib/gitlab/qa/report/report_results.rb

@@ -7,7 +7,9 @@ module Gitlab
       class ReportResults < ReportAsIssue
         attr_accessor :testcase_project_reporter, :results_issue_project_reporter, :files, :test_case_project, :results_issue_project, :gitlab
 
-        def initialize(token:, input_files:, test_case_project:, results_issue_project:, dry_run: false, **kwargs)
+        IGNORE_EXCEPTIONS = ['Net::ReadTimeout'].freeze
+
+        def initialize(token:, input_files:, test_case_project: nil, results_issue_project: nil, dry_run: false, **kwargs)
           @testcase_project_reporter = Gitlab::QA::Report::ResultsInTestCases.new(token: token, input_files: input_files, project: test_case_project, dry_run: dry_run, **kwargs)
           @results_issue_project_reporter = Gitlab::QA::Report::ResultsInIssues.new(token: token, input_files: input_files, project: results_issue_project, dry_run: dry_run, **kwargs)
           @test_case_project = test_case_project
@@ -32,7 +34,7 @@ module Gitlab
             test_results.each do |test|
               puts "Reporting test: #{test.file} | #{test.name}\n"
 
-              report_test(test) unless test.skipped
+              report_test(test) if should_report?(test)
             end
 
             test_results.write
@@ -54,6 +56,40 @@ module Gitlab
           testcase_project_reporter.update_testcase(testcase, test)
           results_issue_project_reporter.update_issue(issue, test)
         end
+
+        # Checks if a test result should be reported.
+        #
+        # @return [Boolean] false if the test was skipped or failed because of a transient error that can be ignored.
+        # Otherwise returns true.
+        def should_report?(test)
+          return false if test.skipped
+
+          if test.report.key?('exceptions')
+            reason = ignore_failure_reason(test.report['exceptions'])
+
+            if reason
+              puts "Issue update skipped because #{reason}"
+
+              return false
+            end
+          end
+
+          true
+        end
+
+        # Determine any reason to ignore a failure.
+        #
+        # @param [Array<Hash>] exceptions the exceptions associated with the failure.
+        # @return [String] the reason to ignore the exceptions, or `nil` if any exceptions should not be ignored.
+        def ignore_failure_reason(exceptions)
+          exception_classes = exceptions
+            .filter_map { |exception| exception['class'] if IGNORE_EXCEPTIONS.include?(exception['class']) }
+            .compact
+          return if exception_classes.empty? || exception_classes.size < exceptions.size
+
+          msg = exception_classes.many? ? 'the errors were' : 'the error was'
+          "#{msg} #{exception_classes.join(', ')}"
+        end
       end
     end
   end

data/lib/gitlab/qa/report/results_in_issues.rb

@@ -35,7 +35,7 @@ module Gitlab
           note_posted = note_status(issue, test)
 
           if labels_updated || note_posted
-            puts "Issue updated."
+            puts "Issue updated: #{issue.web_url}"
           else
             puts "Test passed, no results issue update needed."
           end

data/lib/gitlab/qa/runner.rb

@@ -15,6 +15,7 @@ module Gitlab
         Runtime::Scenario.define(:seed_db, false)
         Runtime::Scenario.define(:seed_admin_token, true) # Create an admin access token for root user by default
         Runtime::Scenario.define(:omnibus_exec_commands, [])
+        Runtime::Scenario.define(:skip_server_hooks, false)
 
         # Omnibus Configurators specified by flags
         @active_configurators = []
@@ -37,6 +38,10 @@ module Gitlab
             Runtime::Scenario.define(:seed_admin_token, false)
           end
 
+          opts.on('--skip-server-hooks', 'Skip adding global git server hooks') do
+            Runtime::Scenario.define(:skip_server_hooks, true)
+          end
+
           opts.on('--qa-image QA_IMAGE', String, 'Specifies a QA image to be used instead of inferring it from the GitLab image. See Gitlab::QA::Release#qa_image') do |value|
             Runtime::Scenario.define(:qa_image, value)
           end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require 'fileutils'
 
 module Gitlab
   module QA
@@ -12,13 +13,10 @@ module Gitlab
 
         def self.logger
           @logger ||= begin
-            log_path = Runtime::Env.log_path
-            FileUtils.mkdir_p(log_path) unless File.exist?(log_path)
+            log_path = Env.log_path
+            ::FileUtils.mkdir_p(log_path) unless File.exist?(log_path)
 
-            QA::TestLogger.logger(
-              level: Runtime::Env.debug? ? "DEBUG" : Runtime::Env.log_level,
-              path: log_path
-            )
+            TestLogger.logger(level: Env.debug? ? "DEBUG" : Env.log_level, path: log_path)
           end
         end
       end

data/lib/gitlab/qa/runtime/omnibus_configurations/{ci_decomposition.rb → decomposition_multiple_db.rb}

@@ -4,7 +4,7 @@ module Gitlab
   module QA
     module Runtime
       module OmnibusConfigurations
-        class CiDecomposition < Default
+        class DecompositionMultipleDb < Default
           def configuration
             # HACK: commenting commands out as these commands should be run *after* the first
             # reconfiguration (see first command in #exec_commands)

data/lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class DecompositionSingleDb < Default
+          def configuration
+            <<~OMNIBUS
+              gitlab_rails['databases']['main']['enable'] = true
+              gitlab_rails['databases']['ci']['enable'] = true
+              gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
+            OMNIBUS
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -12,22 +12,43 @@ module Gitlab
           # the window defined by the `weekday_hours` method.
           # We perform a single API call to get the commit
           class Version < Scenario::Template
+            SOURCE_MAP = {
+              'git@dev.gitlab.org:gitlab/gitlab-ee.git' => {
+                host: 'dev.gitlab.org',
+                project: 'gitlab/gitlab-ee'
+              },
+              'git@dev.gitlab.org:gitlab/gitlabhq.git' => {
+                host: 'dev.gitlab.org',
+                project: 'gitlab/gitlabhq'
+              },
+              'git@gitlab.com:gitlab-org/gitlab.git' => {
+                host: 'gitlab.com',
+                project: 'gitlab-org/gitlab'
+              },
+              'git@gitlab.com:gitlab-org/gitlab-foss.git' => {
+                host: 'gitlab.com',
+                project: 'gitlab-org/gitlab-foss'
+              }
+            }.freeze
+
             def perform(release = 'ce')
               version = Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.act do
                   pull
-                  sha_version
+                  rails_version
                 end
               end
 
-              project = "gitlab-org/#{QA::Release.new(release).api_project_name}"
-              commit = api_commit_detail(project, version)
+              project = SOURCE_MAP[version[:source]][:project]
+              host = SOURCE_MAP[version[:source]][:host]
+              sha = version[:sha]
+              commit = api_commit_detail(host, project, sha)
 
               if commit_within_hours?(commit['created_at'], weekday_hours(commit['created_at']))
-                puts "Found commit #{version} in recent history of #{project}"
+                puts "Found commit #{sha} in recent history of #{project} on #{host}"
               else
-                puts "Did not find #{version} in recent history of #{project}"
+                puts "Did not find #{sha} in recent history of #{project} on #{host}"
                 exit 1
               end
             end
@@ -51,9 +72,14 @@ module Gitlab
               Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - hours * 60 * 60).utc).to_datetime
             end
 
-            def api_commit_detail(project, commit_id)
-              api = 'https://gitlab.com/api/v4'
-              url = "#{api}/projects/#{CGI.escape(project)}/repository/commits/#{commit_id}"
+            def api_commit_detail(host, project, sha)
+              url = "https://#{host}/api/v4/projects/#{CGI.escape(project)}/repository/commits/#{sha}"
+
+              if host == 'dev.gitlab.org'
+                Runtime::Env.require_qa_dev_access_token!
+
+                url = "#{url}?private_token=#{Runtime::Env.qa_dev_access_token}"
+              end
 
               JSON.parse(Net::HTTP.get(URI(url)))
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.29.0'
+    VERSION = '7.31.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -20,7 +20,8 @@ module Gitlab
         autoload :ObjectStorageGcs, 'gitlab/qa/runtime/omnibus_configurations/object_storage_gcs'
         autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
         autoload :RegistryObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/registry_object_storage'
-        autoload :CiDecomposition, 'gitlab/qa/runtime/omnibus_configurations/ci_decomposition'
+        autoload :DecompositionSingleDb, 'gitlab/qa/runtime/omnibus_configurations/decomposition_single_db'
+        autoload :DecompositionMultipleDb, 'gitlab/qa/runtime/omnibus_configurations/decomposition_multiple_db'
       end
     end
 

data/scripts/generate-qa-jobs.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'yaml'
+
 class GenerateQAJobs
   def initialize(no_of_example_files)
     @no_of_example_files = no_of_example_files
@@ -7,63 +9,82 @@ class GenerateQAJobs
   end
 
   # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/PerceivedComplexity
-  # rubocop:disable Metrics/CyclomaticComplexity
   def execute
     jobs = load_yml_contents('base')
-    jobs.concat(load_yml_contents('sanity_framework'))
-    jobs.concat(load_yml_contents('custom_parallel'))
-    jobs.concat(load_yml_contents('instance')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('relative_url')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('ci_decomposition')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('repository_storage')) if should_run?('test_instance_all_repository_storage')
-    jobs.concat(load_yml_contents('omnibus_image'))
-    jobs.concat(load_yml_contents('update')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('omnibus_upgrade'))
-    jobs.concat(load_yml_contents('ee_previous_to_ce_update'))
-    jobs.concat(load_yml_contents('mattermost')) if should_run?('test_integration_mattermost')
-    jobs.concat(load_yml_contents('service_ping_disabled')) if should_run?('test_integration_servicepingdisabled')
-    jobs.concat(load_yml_contents('ldap_no_tls')) if should_run?('test_integration_ldapnotls')
-    jobs.concat(load_yml_contents('ldap_tls')) if should_run?('test_integration_ldaptls')
-    jobs.concat(load_yml_contents('ldap_no_server')) if should_run?('test_integration_ldapnoserver')
-    jobs.concat(load_yml_contents('instance_saml')) if should_run?('test_integration_instancesaml')
-    jobs.concat(load_yml_contents('group_saml')) if should_run?('test_integration_groupsaml')
-    jobs.concat(load_yml_contents('object_storage')) if should_run?('test_instance_all_object_storage')
-    jobs.concat(load_yml_contents('object_storage_aws')) if should_run?('test_instance_all_object_storage')
-    jobs.concat(load_yml_contents('object_storage_gcs')) if should_run?('test_instance_all_object_storage')
-    jobs.concat(load_yml_contents('object_storage_registry_tls')) if should_run?('test_integration_registrytls')
-    jobs.concat(load_yml_contents('registry')) if should_run?('test_integration_registry')
-    jobs.concat(load_yml_contents('packages')) if should_run?('test_instance_all_packages')
-    jobs.concat(load_yml_contents('elasticsearch')) if should_run?('test_integration_elasticsearch')
-    jobs.concat(load_yml_contents('praefect')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('gitaly_cluster')) if should_run?('test_instance_all')
-    jobs.concat(load_yml_contents('mtls')) if should_run?('test_instance_all_mtls')
-    jobs.concat(load_yml_contents('smtp')) if should_run?('test_integration_smtp')
-    jobs.concat(load_yml_contents('jira')) if should_run?('test_instance_all_jira')
-    jobs.concat(load_yml_contents('integrations')) if should_run?('test_instance_all_integrations')
-    jobs.concat(load_yml_contents('large_setup')) if should_run?('test_instance_all_can_use_large_setup')
-    jobs.concat(load_yml_contents('cloud_activation')) if should_run?('test_instance_all_cloud_activation')
-    jobs.concat(load_yml_contents('registry_with_cdn')) if should_run?('test_integration_registrywithcdn')
-    jobs.concat(load_yml_contents('staging'))
+    jobs.merge!(load_yml_contents('sanity_framework'))
+    jobs.merge!(load_yml_contents('custom_parallel'))
+    jobs.merge!(load_yml_contents('instance', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('relative_url', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('decomposition_single_db', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('decomposition_multiple_db', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('repository_storage', should_automatically_run?('test_instance_all_repository_storage')))
+    jobs.merge!(load_yml_contents('omnibus_image'))
+    jobs.merge!(load_yml_contents('update', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('omnibus_upgrade'))
+    jobs.merge!(load_yml_contents('ee_previous_to_ce_update'))
+    jobs.merge!(load_yml_contents('mattermost', should_automatically_run?('test_integration_mattermost')))
+    jobs.merge!(load_yml_contents('service_ping_disabled', should_automatically_run?('test_integration_servicepingdisabled')))
+    jobs.merge!(load_yml_contents('ldap_no_tls', should_automatically_run?('test_integration_ldapnotls')))
+    jobs.merge!(load_yml_contents('ldap_tls', should_automatically_run?('test_integration_ldaptls')))
+    jobs.merge!(load_yml_contents('ldap_no_server', should_automatically_run?('test_integration_ldapnoserver')))
+    jobs.merge!(load_yml_contents('instance_saml', should_automatically_run?('test_integration_instancesaml')))
+    jobs.merge!(load_yml_contents('group_saml', should_automatically_run?('test_integration_groupsaml')))
+    jobs.merge!(load_yml_contents('object_storage', should_automatically_run?('test_instance_all_object_storage')))
+    jobs.merge!(load_yml_contents('object_storage_aws', should_automatically_run?('test_instance_all_object_storage')))
+    jobs.merge!(load_yml_contents('object_storage_gcs', should_automatically_run?('test_instance_all_object_storage')))
+    jobs.merge!(load_yml_contents('object_storage_registry_tls', should_automatically_run?('test_integration_registrytls')))
+    jobs.merge!(load_yml_contents('registry', should_automatically_run?('test_integration_registry')))
+    jobs.merge!(load_yml_contents('packages', should_automatically_run?('test_instance_all_packages')))
+    jobs.merge!(load_yml_contents('elasticsearch', should_automatically_run?('test_integration_elasticsearch')))
+    jobs.merge!(load_yml_contents('praefect', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('gitaly_cluster', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('mtls', should_automatically_run?('test_instance_all_mtls')))
+    jobs.merge!(load_yml_contents('smtp', should_automatically_run?('test_integration_smtp')))
+    jobs.merge!(load_yml_contents('jira', should_automatically_run?('test_instance_all_jira')))
+    jobs.merge!(load_yml_contents('integrations', should_automatically_run?('test_instance_all_integrations')))
+    jobs.merge!(load_yml_contents('large_setup', should_automatically_run?('test_instance_all_can_use_large_setup')))
+    jobs.merge!(load_yml_contents('cloud_activation', should_automatically_run?('test_instance_all_cloud_activation')))
+    jobs.merge!(load_yml_contents('registry_with_cdn', should_automatically_run?('test_integration_registrywithcdn')))
+    jobs.merge!(load_yml_contents('staging'))
 
     # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/774
-    # base.concat(load_yml_contents('geo')) if should_run?('scenario_test_geo')
+    # jobs.merge!(load_yml_contents('geo', should_automatically_run?('scenario_test_geo')))
+
+    yaml_string = jobs.to_yaml
+    de_stringify_reference(yaml_string)
 
-    jobs
+    yaml_string
   end
+
   # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/PerceivedComplexity
-  # rubocop:enable Metrics/CyclomaticComplexity
 
   private
 
-  def should_run?(example_file_name)
+  def should_automatically_run?(example_file_name)
     @no_of_example_files.include?(example_file_name)
   end
 
-  def load_yml_contents(file_prefix)
+  def load_yml_contents(file_prefix, automatic = true)
     jobs_dir_path = File.expand_path('../.gitlab/ci/jobs', __dir__)
-    File.read(File.join(jobs_dir_path, "#{file_prefix}.gitlab-ci.yml"))
+    file_contents = File.read(File.join(jobs_dir_path, "#{file_prefix}.gitlab-ci.yml"))
+
+    # Enclose !reference in double quotes at it is not supported with YAML.load
+    stringify_reference(file_contents)
+    yaml_hash = YAML.safe_load(file_contents)
+
+    yaml_hash.each { |key, value| value.merge!("when" => "manual") } unless automatic
+
+    yaml_hash
+  end
+
+  def stringify_reference(str)
+    match_data = str.match(/!reference \[[a-zA-Z_, ]*\]/)
+    str.gsub!(match_data[0], "\"#{match_data[0]}\"") if match_data
+  end
+
+  def de_stringify_reference(str)
+    match_data = str.match(/"(!reference \[[a-zA-Z_, ]*\])"/)
+    str.gsub!(match_data[0], match_data[1]) if match_data
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.29.0
+  version: 7.31.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -219,9 +219,10 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/ci/jobs/base.gitlab-ci.yml"
-- ".gitlab/ci/jobs/ci_decomposition.gitlab-ci.yml"
 - ".gitlab/ci/jobs/cloud_activation.gitlab-ci.yml"
 - ".gitlab/ci/jobs/custom_parallel.gitlab-ci.yml"
+- ".gitlab/ci/jobs/decomposition_multiple_db.gitlab-ci.yml"
+- ".gitlab/ci/jobs/decomposition_single_db.gitlab-ci.yml"
 - ".gitlab/ci/jobs/ee_previous_to_ce_update.gitlab-ci.yml"
 - ".gitlab/ci/jobs/elasticsearch.gitlab-ci.yml"
 - ".gitlab/ci/jobs/geo.gitlab-ci.yml"
@@ -336,7 +337,8 @@ files:
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/runtime/logger.rb
 - lib/gitlab/qa/runtime/omnibus_configuration.rb
-- lib/gitlab/qa/runtime/omnibus_configurations/ci_decomposition.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/decomposition_multiple_db.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/default.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb