gitlab-qa 5.15.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ae85f17e98b415ac5fddd505d5cf9d37462bbcc5b0eabee7584c3a26803542
-  data.tar.gz: 62ea7475a8d3eddb193a975c440fc19b2177ea612ecf8a02d9bbf9a8c926f177
+  metadata.gz: 960a5ea5f4f964cf9e9a237d75e96350bd611e9c6b9c1e1721c3dd2df1476104
+  data.tar.gz: 4c42c1a2652f8f6d49565e849bbb6e3ecdce24d1d11662478cdd511424d7a020
 SHA512:
-  metadata.gz: 35e187728145ac187fda0dbe3b41b24d44adc52a3cb8718083736ccf0e36f06a089c74e97db983b4b40f2eb432fa847c440208e083df24d8f9a5df76a495b0d7
-  data.tar.gz: a7e08091352126ada545f61b6d7a940e0eb87f4ec9d9753fa0521244c2f35b209a0474eb158b7e82486ee7fe5ae59047d3748fd6aadd36922d96b9520081b177
+  metadata.gz: 3e09dabf4c89b97a6a92d7d78a4bccaa57605f85ff0559c9423cc55b1bb3e6fb5f926ba1ccad193ee7e04c17b774502b47862011abc674cc00e84a323590a611
+  data.tar.gz: c88cd735d53a3c1d17c4aaf28b7af47a1a0ac827d6f3012d187e43b1f897616472f35618cfe9f419b87ff1e88cfb6d5922e49ec53db9cc4c2d3b154f8ab3a786

data/.gitlab-ci.yml

@@ -94,7 +94,7 @@ release:
     - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
     - exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.xml" --project "$QA_TESTCASES_REPORTING_PROJECT"; fi
+    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
     - exit $test_run_exit_code
 
 .ce-qa:
@@ -143,7 +143,7 @@ release:
 .rspec-report-opts:
   variables:
     FILE_SAFE_JOB_NAME: $(echo $CI_JOB_NAME | sed 's/[ /]/_/g')
-    RSPEC_REPORT_OPTS: "--format RspecJunitFormatter --out \"tmp/rspec-${CI_JOB_ID}.xml\" --format html --out \"tmp/rspec-${FILE_SAFE_JOB_NAME}.htm\" --color --format documentation"
+    RSPEC_REPORT_OPTS: "--format QA::Support::JsonFormatter --out \"tmp/rspec-${CI_JOB_ID}.json\" --format RspecJunitFormatter --out \"tmp/rspec-${CI_JOB_ID}.xml\" --format html --out \"tmp/rspec-${FILE_SAFE_JOB_NAME}.htm\" --color --format documentation"
 
 .quarantine:
   allow_failure: true
@@ -832,6 +832,44 @@ ee:praefect-quarantine:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
+ce:gitaly-cluster:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ce:gitaly-cluster-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ee:gitaly-cluster:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ee:gitaly-cluster-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
 ce:smtp:
   extends:
     - .test
@@ -893,7 +931,8 @@ ee:jira-quarantine:
 staging:
   script:
     - unset EE_LICENSE
-    - exe/gitlab-qa Test::Instance::Staging
+    - 'echo "Running: exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
+    - exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
   extends:
     - .test
     - .high-capacity

data/docs/what_tests_can_be_run.md

@@ -1,5 +1,6 @@
-# What tests can be run?
 
+# What tests can be run?
+[[_TOC_]]
 ## The two types of QA tests
 
 First of all, the first thing to choose is whether you want to run orchestrated
@@ -28,6 +29,8 @@ For more details on the internals, please read the
 
 ## Supported GitLab environment variables
 
+All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa/runtime/env.rb`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/lib/gitlab/qa/runtime/env.rb).
+
 |        Variable       | Default   | Description           | Required |
 |-----------------------|-----------|-----------------------|----------|
 | `GITLAB_USERNAME`       | `root`  | Username to use when signing into GitLab. | Yes|
@@ -53,7 +56,8 @@ For more details on the internals, please read the
 | `GITLAB_SANDBOX_NAME`   | `gitlab-qa-sandbox` | The sandbox group name the test suite is going to use. | No|
 | `GITLAB_QA_ACCESS_TOKEN`|-  | A valid personal access token with the `api` scope. This is used for API access during tests, and is used in the version that staging is currently running. An existing token that is valid on [`Test::Instance::Staging`](#testinstancestaging) scenario to retrieve the staging can be found in the shared 1Password vault. |No|
 | `GITLAB_QA_ADMIN_ACCESS_TOKEN` |-  | A valid personal access token with the `api` scope from a user with admin access. Used for API access as an admin during tests. | No|
-| `EE_LICESEN` |-  | Enterprise Edition license. | No|
+| `GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN` | - | A valid personal access token with the `read_registry` scope. Used to [access the container registry on `registry.gitlab.com` when tests run in a CI job that _is not_ triggered via another pipeline](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/364addb83e7b136ff0f9d8719ca9553d290aa9ab/lib/gitlab/qa/release.rb#L152). For example, if you manually run a [new Staging pipeline](https://ops.gitlab.net/gitlab-org/quality/staging/-/pipelines/new), this token will be used. | No |
+| `EE_LICENSE` |-  | Enterprise Edition license. | No|
 | `QA_ARTIFACTS_DIR` |`/tmp/gitlab-qa`| Path to a directory where artifacts (logs and screenshots) for failing tests will be saved. | No|
 | `DOCKER_HOST` |`http://localhost`| Docker host to run tests against. | No|
 | `CHROME_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
@@ -83,8 +87,27 @@ For more details on the internals, please read the
 
 ## Running tests with a feature flag enabled
 
-It is possible to enable a feature flag before running tests. See the [QA
-framework documentation](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/README.md#running-tests-with-a-feature-flag-enabled) for details.
+It is possible to enable or disable a feature flag before running tests.
+To test a Gitlab image with a feature flag enabled, run this command:
+```
+$ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --enable-feature feature_flag_name
+```
+
+To run a test with feature flag disabled, run this command:
+```
+$ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --disable-feature feature_flag_name
+```
+
+You an also test a GitLab image multiple times with different feature flag settings:
+```
+$ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --disable-feature feature_flag_name --enable-feature feature_flag_name
+```
+This will first disable `feature_flag_name` flag and run the tests and then enable it and run the tests again.
+
+You can pass any number of feature flag settings. The tests will run once for each setting.
+
+See the [QA framework documentation](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/README.md#running-tests-with-a-feature-flag-enabled)
+for information on running the tests with different feature flag settings from the QA framework.
 
 ## Specifying the GitLab version
 
@@ -217,6 +240,25 @@ $ gitlab-qa Test::Integration::Geo EE
 
 [test-geo]: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/qa/qa/ee/scenario/test/geo.rb
 
+### `Test::Integration::GitalyCluster CE|EE|<full image address>`
+
+This tests [Gitaly Cluster](https://docs.gitlab.com/ee/administration/gitaly/praefect.html),
+a clustered configuration of the Gitaly repository storage service.
+
+The scenario configures and starts several docker containers to
+represent the [recommended minimum configuration](https://docs.gitlab.com/ee/administration/gitaly/praefect.html#requirements-for-configuring-a-gitaly-cluster)
+of a Gitaly Cluster.
+
+To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Instance::All` scenario with the `:gitaly_cluster` tag.
+
+Example:
+
+```
+$ gitlab-qa Test::Integration::GitalyCluster EE
+```
+
 ### `Test::Integration::LDAPNoTLS CE|EE|<full image address>`
 
 This tests that a GitLab instance works as expected with an external
@@ -545,7 +587,7 @@ in the GitLab CE project).
 
 - `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 from the Omnibus GitLab `dev` Container Registry.
+  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.
 
@@ -560,6 +602,41 @@ $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 $ gitlab-qa Test::Instance::Staging
 ```
 
+### `Test::Instance::StagingGeo`
+
+This scenario tests that the Geo staging deployment (with [`staging.gitlab.com`](https://staging.gitlab.com) as the primary site and [`geo.staging.gitlab.com`](https://geo.staging.gitlab.com) as the secondary site) works as expected by running tests tagged `:geo` against it. This is done by spinning up a GitLab QA (`gitlab/gitlab-qa`) container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment.
+
+**Required user properties:**
+
+- The user must provide OAuth authorization on the secondary site before running Geo tests. This can be done via the authorization modal that appears after logging into the secondary node for the first time.
+
+- Some Geo tests require the user to have Admin access level (for example, the Geo Nodes API tests)
+
+**Required environment variables:**
+
+- `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.
+
+**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.
+
+Example:
+
+```
+$ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
+$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
+$ export GITLAB_USERNAME="gitlab-qa"
+$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
+
+$ gitlab-qa Test::Instance::StagingGeo
+```
+
 ### `Test::Instance::Production`
 
 This scenario functions the same as `Test::Instance::Staging`
@@ -633,6 +710,25 @@ $ export EE_LICENSE=$(cat /path/to/gitlab_license)
 $ gitlab-qa Test::Instance::Airgapped EE -- --tag smoke
 ```
 
+### `Test::Instance::Geo EE|<full image address>:nightly|latest|any_tag http://geo-primary.gitlab http://geo-secondary.gitlab`
+
+This scenario will run tests tagged `:geo` against a live Geo deployment, by spinning up a GitLab QA (`gitlab/gitlab-qa`)
+container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment. The URLs for the primary site and secondary site of the live Geo deployment must be provided as command line arguments.
+
+**Required user properties:**
+
+- The user must provide OAuth authorization on the secondary site before running Geo tests. This can be done via the authorization modal that appears after signing into the secondary node for the first time.
+
+- Some Geo tests require the user to have Admin access level (for example, the Geo Nodes API tests)
+
+Example:
+
+```
+$ export GITLAB_USERNAME="gitlab-qa"
+$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
+
+$ gitlab-qa Test::Instance::Geo EE https://primary.gitlab.com https://secondary.gitlab.com
+```
 ----
 
 [Back to README.md](../README.md)

data/lib/gitlab/qa.rb

@@ -54,7 +54,7 @@ module Gitlab
           autoload :Praefect, 'gitlab/qa/scenario/test/integration/praefect'
           autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'
           autoload :SMTP, 'gitlab/qa/scenario/test/integration/smtp'
-          autoload :GitalyHA, 'gitlab/qa/scenario/test/integration/gitaly_ha'
+          autoload :GitalyCluster, 'gitlab/qa/scenario/test/integration/gitaly_cluster'
           autoload :Jira, 'gitlab/qa/scenario/test/integration/jira'
         end
 
@@ -97,9 +97,12 @@ module Gitlab
     end
 
     module Report
+      autoload :JsonTestResults, 'gitlab/qa/report/json_test_results'
+      autoload :JUnitTestResults, 'gitlab/qa/report/junit_test_results'
       autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'
       autoload :ResultsInIssues, 'gitlab/qa/report/results_in_issues'
       autoload :SummaryTable, 'gitlab/qa/report/summary_table'
+      autoload :TestResult, 'gitlab/qa/report/test_result'
       autoload :UpdateScreenshotPath, 'gitlab/qa/report/update_screenshot_path'
     end
 

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

@@ -41,16 +41,12 @@ module Gitlab
           raise NotImplementedError, "#{self.class.name} must specify a docker image tag as DOCKER_IMAGE_TAG"
         end
 
-        def instance
-          prepare
-          start
-          reconfigure
-          wait_until_ready
-          process_exec_commands
-
-          yield self if block_given?
+        def instance(skip_teardown: false)
+          instance_no_teardown do
+            yield self if block_given?
+          end
         ensure
-          teardown
+          teardown unless skip_teardown
         end
 
         alias_method :launch_and_teardown_instance, :instance
@@ -141,6 +137,16 @@ module Gitlab
           raise 'Invalid instance name!' unless name
         end
 
+        def instance_no_teardown
+          prepare
+          start
+          reconfigure
+          wait_until_ready
+          process_exec_commands
+
+          yield self if block_given?
+        end
+
         def teardown?
           !Runtime::Scenario.attributes.include?(:teardown) || Runtime::Scenario.teardown
         end

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

@@ -27,26 +27,50 @@ module Gitlab
 
           name = "#{release.project_name}-qa-#{SecureRandom.hex(4)}"
 
-          @docker.run(release.qa_image, release.qa_tag, suite, *args) do |command|
-            command << "-t --rm --net=#{network || 'bridge'}"
+          feature_flag_sets = []
 
-            env.merge(Runtime::Env.variables).each do |key, value|
-              command.env(key, value)
-            end
+          # When `args` includes `[..., "--disable-feature", "a", "--enable-feature", "b", ...]`
+          # `feature_flag_sets` will be set to `[["--disable-feature", "a"], ["--enable-feature", "b"]]`
+          # This will result in tests running twice, once with each feature.
+          while (index = args&.index { |x| x =~ /--.*-feature/ })
+            feature_flag_sets << args.slice!(index, 2)
+          end
 
-            command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-            command.volume(File.join(Runtime::Env.host_artifacts_dir, name), File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'))
+          # When `args` do not have either "--disable-feature" or "--enable-feature", we
+          # add [] so that test is run exactly once.
+          feature_flag_sets << [] unless feature_flag_sets.any?
 
-            @volumes.to_h.each do |to, from|
-              command.volume(to, from)
-            end
+          feature_flag_sets.each do |feature_flag_set|
+            @docker.run(release.qa_image, release.qa_tag, suite, *args_with_flags(args, feature_flag_set)) do |command|
+              command << "-t --rm --net=#{network || 'bridge'}"
+
+              env.merge(Runtime::Env.variables).each do |key, value|
+                command.env(key, value)
+              end
+
+              command.volume('/var/run/docker.sock', '/var/run/docker.sock')
+              command.volume(File.join(Runtime::Env.host_artifacts_dir, name), File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'))
+
+              @volumes.to_h.each do |to, from|
+                command.volume(to, from)
+              end
 
-            command.name(name)
+              command.name(name)
+            end
           end
         end
 
         private
 
+        def args_with_flags(args, feature_flag_set)
+          return args if feature_flag_set.empty?
+
+          puts "Running with feature flag: #{feature_flag_set.join(' ')}"
+
+          args_with_f = args.dup
+          args_with_f.insert(1, *feature_flag_set)
+        end
+
         def skip_tests?
           Runtime::Scenario.attributes.include?(:run_tests) && !Runtime::Scenario.run_tests
         end

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

@@ -4,8 +4,9 @@ module Gitlab
       class Command
         attr_reader :args
 
-        def initialize(cmd = nil)
+        def initialize(cmd = nil, mask_secrets: nil)
           @args = Array(cmd)
+          @mask_secrets = Array(mask_secrets)
         end
 
         def <<(*args)
@@ -28,6 +29,17 @@ module Gitlab
           "docker #{@args.join(' ')}"
         end
 
+        # Returns a masked string form of a Command
+        #
+        # @example
+        #   Command.new('a docker command', mask_secrets: 'command').mask_secrets #=> 'a docker *****'
+        #   Command.new('a docker command', mask_secrets: %w[docker command]).mask_secrets #=> 'a ***** *****'
+        #
+        # @return [String] The masked command string
+        def mask_secrets
+          @mask_secrets.each_with_object(to_s) { |secret, s| s.gsub!(secret, '*****') }
+        end
+
         def ==(other)
           to_s == other.to_s
         end
@@ -36,8 +48,8 @@ module Gitlab
           Docker::Shellout.new(self).execute!(&block)
         end
 
-        def self.execute(cmd, &block)
-          new(cmd).execute!(&block)
+        def self.execute(cmd, mask_secrets: nil, &block)
+          new(cmd, mask_secrets: mask_secrets).execute!(&block)
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Gitlab
         end
 
         def login(username:, password:, registry:)
-          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}))
+          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
         end
 
         def pull(image, tag)

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

@@ -10,7 +10,7 @@ module Gitlab
           @command = command
           @output = []
 
-          puts "Docker shell command: `#{@command}`"
+          puts "Docker shell command: `#{@command.mask_secrets}`"
         end
 
         def execute!
@@ -28,7 +28,7 @@ module Gitlab
             end
 
             if wait.value.exited? && wait.value.exitstatus.nonzero?
-              raise StatusError, "Docker command `#{@command}` failed!"
+              raise StatusError, "Docker command `#{@command.mask_secrets}` failed!"
             end
           end
 

data/lib/gitlab/qa/release.rb

@@ -147,14 +147,15 @@ module Gitlab
             registry: DEV_REGISTRY
           }
         elsif omnibus_mirror?
-          username, password = if Runtime::Env.ci_job_token
+          username, password = if Runtime::Env.ci_job_token && Runtime::Env.ci_pipeline_source == 'pipeline'
                                  ['gitlab-ci-token', Runtime::Env.ci_job_token]
+                               elsif Runtime::Env.qa_container_registry_access_token
+                                 [Runtime::Env.gitlab_username, Runtime::Env.qa_container_registry_access_token]
                                else
                                  Runtime::Env.require_qa_access_token!
 
                                  [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
                                end
-
           {
             username: username,
             password: password,

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Gitlab
+  module QA
+    module Report
+      class JsonTestResults
+        include Enumerable
+
+        def initialize(file)
+          @testcases = JSON.parse(File.read(file))['examples'].map { |test| TestResult.from_json(test) }
+        end
+
+        def each(&block)
+          @testcases.each(&block)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+
+module Gitlab
+  module QA
+    module Report
+      class JUnitTestResults
+        include Enumerable
+
+        def initialize(file)
+          @testcases = Nokogiri::XML(File.read(file)).xpath('//testcase').map { |test| TestResult.from_junit(test) }
+        end
+
+        def each(&block)
+          @testcases.each(&block)
+        end
+      end
+    end
+  end
+end

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

@@ -46,7 +46,18 @@ module Gitlab
 
           Dir.glob(files).each do |file|
             puts "Reporting tests in #{file}"
-            Nokogiri::XML(File.open(file)).xpath('//testcase').each do |test|
+            extension = File.extname(file)
+
+            case extension
+            when '.json'
+              test_results = Report::JsonTestResults.new(file)
+            when '.xml'
+              test_results = Report::JUnitTestResults.new(file)
+            else
+              raise "Unknown extension #{extension}"
+            end
+
+            test_results.each do |test|
               report_test(test)
             end
           end
@@ -99,9 +110,9 @@ module Gitlab
         end
 
         def report_test(test)
-          return if test.search('skipped').any?
+          return if test.skipped
 
-          puts "Reporting test: #{test['file']} | #{test['name']}"
+          puts "Reporting test: #{test.file} | #{test.name}"
 
           issue = find_issue(test)
           if issue
@@ -124,29 +135,37 @@ module Gitlab
             Gitlab.create_issue(
               project,
               title_from_test(test),
-              { description: "### Full description\n\n#{search_safe(test['name'])}\n\n### File path\n\n#{test['file']}", labels: 'status::automated' }
+              { description: "### Full description\n\n#{search_safe(test.name)}\n\n### File path\n\n#{test.file}", labels: 'status::automated' }
             )
           end
         end
 
+        # rubocop:disable Metrics/AbcSize
         def find_issue(test)
           handle_gitlab_client_exceptions do
+            return Gitlab.issue(project, id_from_status_issue_url(test.status_issue)) if test.status_issue
+
             issues = Gitlab.issues(project, { search: search_term(test) })
               .auto_paginate
               .select { |issue| issue.state == 'opened' && issue.title.strip == title_from_test(test) }
 
-            warn(%(Too many issues found with the file path "#{test['file']}" and name "#{test['name']}")) if issues.many?
+            warn(%(Too many issues found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
 
             issues.first
           end
         end
+        # rubocop:enable Metrics/AbcSize
+
+        def id_from_status_issue_url(url)
+          url.split('/').last.to_i
+        end
 
         def search_term(test)
-          %("#{test['file']}" "#{search_safe(test['name'])}")
+          %("#{test.file}" "#{search_safe(test.name)}")
         end
 
         def title_from_test(test)
-          title = "#{partial_file_path(test['file'])} | #{search_safe(test['name'])}".strip
+          title = "#{partial_file_path(test.file)} | #{search_safe(test.name)}".strip
 
           return title unless title.length > MAX_TITLE_LENGTH
 
@@ -162,7 +181,7 @@ module Gitlab
         end
 
         def note_status(issue, test)
-          return if failures(test).empty?
+          return if test.failures.empty?
 
           note = note_content(test)
 
@@ -176,7 +195,7 @@ module Gitlab
         end
 
         def note_content(test)
-          errors = failures(test).each_with_object([]) do |failure, text|
+          errors = test.failures.each_with_object([]) do |failure, text|
             text << <<~TEXT
               Error:
               ```
@@ -185,7 +204,7 @@ module Gitlab
 
               Stacktrace:
               ```
-              #{failure.content}
+              #{failure['stacktrace']}
               ```
             TEXT
           end.join("\n\n")
@@ -231,7 +250,7 @@ module Gitlab
         def update_labels(issue, test)
           labels = issue.labels
           labels.delete_if { |label| label.start_with?("#{pipeline}::") }
-          labels << (failures(test).empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
+          labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
           labels << "Enterprise Edition" if ee_test?(test)
           quarantine_job? ? labels << "quarantine" : labels.delete("quarantine")
 
@@ -242,11 +261,7 @@ module Gitlab
         # rubocop:enable Metrics/AbcSize
 
         def ee_test?(test)
-          test['file'] =~ %r{features/ee/(api|browser_ui)}
-        end
-
-        def failures(test)
-          test.search('failure')
+          test.file =~ %r{features/ee/(api|browser_ui)}
         end
 
         def pipeline

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Report
+      class TestResult
+        attr_accessor :name, :file, :skipped, :failures, :status_issue
+
+        def self.from_json(test)
+          new.tap do |test_result|
+            test_result.name = test['full_description']
+            test_result.file = test['file_path']
+            test_result.skipped = test['status'] == 'pending'
+            test_result.failures = failures_from_json_exceptions(test)
+            test_result.status_issue = test['status_issue']
+          end
+        end
+
+        def self.from_junit(test)
+          new.tap do |test_result|
+            test_result.name = test['name']
+            test_result.file = test['file']
+            test_result.skipped = test.search('skipped').any?
+            test_result.failures = failures_from_junit_exceptions(test)
+          end
+        end
+
+        def self.failures_from_json_exceptions(test)
+          return [] unless test.key?('exceptions')
+
+          test['exceptions'].map do |exception|
+            spec_file_first_index = exception['backtrace'].rindex do |line|
+              line.include?(File.basename(test['file_path']))
+            end
+
+            {
+              'message' => "#{exception['class']}: #{exception['message']}",
+              'stacktrace' => exception['backtrace'].slice(0..spec_file_first_index).join("\n")
+            }
+          end
+        end
+        private_class_method :failures_from_json_exceptions
+
+        def self.failures_from_junit_exceptions(test)
+          failures = test.search('failure')
+          return [] if failures.empty?
+
+          failures.map do |exception|
+            trace = exception.content.split("\n").map(&:strip)
+            spec_file_first_index = trace.rindex do |line|
+              line.include?(File.basename(test['file']))
+            end
+
+            {
+              'message' => "#{exception['type']}: #{exception['message']}",
+              'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
+            }
+          end
+        end
+        private_class_method :failures_from_junit_exceptions
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Gitlab
       module Env
         extend self
 
+        # Variables that are used in tests and are passed through to the docker container that executes the tests.
+        # These variables should be listed in /docs/what_tests_can_be_run.md#supported-gitlab-environment-variables
         ENV_VARIABLES = {
           'QA_REMOTE_GRID' => :remote_grid,
           'QA_REMOTE_GRID_USERNAME' => :remote_grid_username,
@@ -38,6 +40,7 @@ module Gitlab
           'SIGNUP_DISABLED' => :signup_disabled,
           '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_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
           'QA_LOG_PATH' => :qa_log_path,
@@ -112,6 +115,10 @@ module Gitlab
           ENV['CI_JOB_URL']
         end
 
+        def ci_pipeline_source
+          ENV['CI_PIPELINE_SOURCE']
+        end
+
         def ci_project_name
           ENV['CI_PROJECT_NAME']
         end
@@ -148,6 +155,10 @@ module Gitlab
           ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
         end
 
+        def qa_container_registry_access_token
+          ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
+        end
+
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(ENV['QA_ARTIFACTS_DIR'] || '/tmp/gitlab-qa', Runtime::Env.run_id)
         end

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

@@ -8,9 +8,6 @@ module Gitlab
 
           class Geo < Scenario::Template
             def perform(release, primary_address, secondary_address, *rspec_args)
-              # Geo requires an EE license
-              Runtime::Env.require_license!
-
               Component::Specs.perform do |specs|
                 specs.suite = 'QA::EE::Scenario::Test::Geo'
                 specs.release = QA::Release.new(release)

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

@@ -27,13 +27,14 @@ module Gitlab
                   gitlab_rails['db_pool'] = 5;
                   gitlab_rails['geo_node_name'] = '#{primary.name}';
                   gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0'];
+                  gitlab_rails['packages_enabled'] = true;
                   postgresql['listen_address'] = '0.0.0.0';
                   postgresql['max_replication_slots'] = 1;
                   postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'];
                   postgresql['sql_user_password'] = 'e1d1469ec5f533651918b4567a3ed1ae';
                   postgresql['trust_auth_cidr_addresses'] = ['0.0.0.0/0','0.0.0.0/0'];
                   sidekiq['concurrency'] = 2;
-                  unicorn['worker_processes'] = 2;
+                  puma['worker_processes'] = 2;
                 OMNIBUS
                 primary.exec_commands = fast_ssh_key_lookup_commands + git_lfs_install_commands
 
@@ -50,11 +51,12 @@ module Gitlab
                       gitlab_rails['db_pool'] = 5;
                       gitlab_rails['geo_node_name'] = '#{secondary.name}';
                       gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0'];
+                      gitlab_rails['packages_enabled'] = true;
                       postgresql['listen_address'] = '0.0.0.0';
                       postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'];
                       postgresql['sql_user_password'] = 'e1d1469ec5f533651918b4567a3ed1ae';
                       sidekiq['concurrency'] = 2;
-                      unicorn['worker_processes'] = 2;
+                      puma['worker_processes'] = 2;
                     OMNIBUS
                     secondary.exec_commands = fast_ssh_key_lookup_commands + git_lfs_install_commands
 

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

@@ -0,0 +1,204 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class GitalyCluster < Scenario::Template
+            attr_reader :gitlab_name, :spec_suite
+
+            def initialize
+              @gitlab_name = 'gitlab-gitaly-cluster'
+              @primary_node_name = 'gitaly1'
+              @secondary_node_name = 'gitaly2'
+              @tertiary_node_name = 'gitaly3'
+              @praefect_node_name = 'praefect'
+              @database = 'postgres'
+              @spec_suite = 'Test::Instance::All'
+              @network = 'test'
+            end
+
+            # rubocop:disable Metrics/AbcSize
+            def perform(release, *rspec_args)
+              gitaly_primary_node = gitaly(@primary_node_name, release)
+              gitaly_secondary_node = gitaly(@secondary_node_name, release)
+              gitaly_tertiary_node = gitaly(@tertiary_node_name, release)
+
+              sql_node = Component::PostgreSQL.new.tap do |sql|
+                sql.name = @database
+                sql.network = @network
+                sql.instance(skip_teardown: true) do
+                  sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
+                end
+              end
+
+              praefect_node = Component::Gitlab.new.tap do |praefect|
+                praefect.release = QA::Release.new(release)
+                praefect.name = @praefect_node_name
+                praefect.network = @network
+                praefect.skip_availability_check = true
+
+                praefect.omnibus_config = praefect_omnibus_configuration
+
+                praefect.instance(skip_teardown: true)
+              end
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.name = gitlab_name
+                gitlab.network = @network
+
+                gitlab.omnibus_config = gitlab_omnibus_configuration
+                gitlab.instance do
+                  puts "Running Gitaly Cluster specs!"
+
+                  rspec_args << "--" unless rspec_args.include?('--')
+                  rspec_args << %w[--tag gitaly_cluster]
+
+                  Component::Specs.perform do |specs|
+                    specs.suite = spec_suite
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            ensure
+              praefect_node&.teardown
+              sql_node&.teardown
+              gitaly_primary_node&.teardown
+              gitaly_secondary_node&.teardown
+              gitaly_tertiary_node&.teardown
+            end
+            # rubocop:enable Metrics/AbcSize
+
+            private
+
+            def disable_other_services
+              <<~OMNIBUS
+                postgresql['enable'] = false;
+                redis['enable'] = false;
+                nginx['enable'] = false;
+                prometheus['enable'] = false;
+                grafana['enable'] = false;
+                puma['enable'] = false;
+                sidekiq['enable'] = false;
+                gitlab_workhorse['enable'] = false;
+                gitlab_rails['rake_cache_clear'] = false;
+                gitlab_rails['auto_migrate'] = false;
+              OMNIBUS
+            end
+
+            def praefect_omnibus_configuration
+              <<~OMNIBUS
+                #{disable_other_services}
+                gitaly['enable'] = false;
+                praefect['enable'] = true;
+                praefect['listen_addr'] = '0.0.0.0:2305';
+                praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
+                praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
+                praefect['database_host'] = '#{@database}.#{@network}';
+                praefect['database_user'] = 'postgres';
+                praefect['database_port'] = 5432;
+                praefect['database_password'] = 'SQL_PASSWORD';
+                praefect['database_dbname'] = 'praefect_production';
+                praefect['database_sslmode'] = 'disable';
+                praefect['postgres_queue_enabled'] = true;
+                praefect['failover_enabled'] = true;
+                praefect['virtual_storages'] = {
+                  'default' => {
+                    '#{@primary_node_name}' => {
+                      'address' => 'tcp://#{@primary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN',
+                      'primary' => true
+                    },
+                    '#{@secondary_node_name}' => {
+                      'address' => 'tcp://#{@secondary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                    },
+                    '#{@tertiary_node_name}' => {
+                      'address' => 'tcp://#{@tertiary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                    }
+                  }
+                };
+              OMNIBUS
+            end
+
+            def gitaly_omnibus_configuration
+              <<~OMNIBUS
+                #{disable_other_services}
+                prometheus['enable'] = true;
+                prometheus_monitoring['enable'] = false;
+                gitaly['enable'] = true;
+                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
+                gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                gitlab_rails['internal_api_url'] = 'http://#{@gitlab_name}.#{@network}';
+                git_data_dirs({
+                  '#{@primary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  },
+                  '#{@secondary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  },
+                  '#{@tertiary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  }
+                });
+              OMNIBUS
+            end
+
+            def gitlab_omnibus_configuration
+              <<~OMNIBUS
+                external_url 'http://#{@gitlab_name}.#{@network}';
+
+                git_data_dirs({
+                  'default' => {
+                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                  }
+                });
+                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                prometheus['scrape_configs'] = [
+                  {
+                    'job_name' => 'praefect',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@praefect_node_name}.#{@network}:9652'
+                      ]
+                    ]
+                  },
+                  {
+                    'job_name' => 'praefect-gitaly',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@primary_node_name}.#{@network}:9236',
+                        '#{@secondary_node_name}.#{@network}:9236',
+                        '#{@tertiary_node_name}.#{@network}:9236'
+                      ]
+                    ]
+                  }
+                ];
+                grafana['disable_login_form'] = false;
+                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
+              OMNIBUS
+            end
+
+            def gitaly(name, release)
+              Component::Gitlab.new.tap do |gitaly|
+                gitaly.release = QA::Release.new(release)
+                gitaly.name = name
+                gitaly.network = @network
+                gitaly.skip_availability_check = true
+                gitaly.omnibus_config = gitaly_omnibus_configuration
+                gitaly.instance(skip_teardown: true)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -65,6 +65,7 @@ module Gitlab
             def omnibus_config_with_praefect
               <<~OMNIBUS
                 gitaly['enable'] = true;
+                gitaly['listen_addr'] = '0.0.0.0:8075';
                 gitaly['auth_token'] = 'secret-token';
                 gitaly['storage'] = [
                   {
@@ -82,7 +83,7 @@ module Gitlab
                 praefect['virtual_storages'] = {
                   'default' => {
                     'praefect-gitaly-0' => {
-                      'address' => 'unix:/var/opt/gitlab/gitaly/gitaly.socket',
+                      'address' => 'tcp://localhost:8075',
                       'token'   => 'secret-token',
                       'primary' => true
                     }

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.15.0'.freeze
+    VERSION = '6.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -257,9 +257,12 @@ files:
 - lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
+- lib/gitlab/qa/report/json_test_results.rb
+- lib/gitlab/qa/report/junit_test_results.rb
 - lib/gitlab/qa/report/prepare_stage_reports.rb
 - lib/gitlab/qa/report/results_in_issues.rb
 - lib/gitlab/qa/report/summary_table.rb
+- lib/gitlab/qa/report/test_result.rb
 - lib/gitlab/qa/report/update_screenshot_path.rb
 - lib/gitlab/qa/reporter.rb
 - lib/gitlab/qa/runner.rb
@@ -284,7 +287,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
-- lib/gitlab/qa/scenario/test/integration/gitaly_ha.rb
+- lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb

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

@@ -1,166 +0,0 @@
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class GitalyHA < Scenario::Template
-            attr_reader :gitlab_name, :spec_suite
-
-            def initialize
-              @gitlab_name = 'gitlab-gitaly-ha'
-              @primary_node = 'gitaly1'
-              @secondary_node = 'gitaly2'
-              @praefect_node = 'praefect'
-              @database = 'postgres'
-              @spec_suite = 'Test::Integration::GitalyHA'
-              @network = 'test'
-            end
-
-            # rubocop:disable Metrics/AbcSize
-            def perform(release, *rspec_args)
-              gitaly(@primary_node, release) do
-                gitaly(@secondary_node, release) do
-                  Component::PostgreSQL.perform do |sql|
-                    sql.name = @database
-                    sql.network = @network
-
-                    sql.instance do
-                      sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
-
-                      Component::Gitlab.perform do |praefect|
-                        praefect.release = QA::Release.new(release)
-                        praefect.name = @praefect_node
-                        praefect.network = @network
-                        praefect.skip_availability_check = true
-
-                        praefect.omnibus_config = praefect_omnibus_configuration
-
-                        praefect.instance do
-                          Component::Gitlab.perform do |gitlab|
-                            gitlab.release = QA::Release.new(release)
-                            gitlab.name = gitlab_name
-                            gitlab.network = @network
-
-                            gitlab.omnibus_config = gitlab_omnibus_configuration
-                            gitlab.instance do
-                              puts "Running Gitaly HA specs!"
-
-                              Component::Specs.perform do |specs|
-                                specs.suite = spec_suite
-                                specs.release = gitlab.release
-                                specs.network = gitlab.network
-                                specs.args = [gitlab.address, *rspec_args]
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-            # rubocop:enable Metrics/AbcSize
-
-            private
-
-            def disable_other_services
-              <<~OMNIBUS
-                postgresql['enable'] = false;
-                redis['enable'] = false;
-                nginx['enable'] = false;
-                prometheus['enable'] = false;
-                grafana['enable'] = false;
-                unicorn['enable'] = false;
-                sidekiq['enable'] = false;
-                gitlab_workhorse['enable'] = false;
-                gitlab_rails['rake_cache_clear'] = false;
-                gitlab_rails['auto_migrate'] = false;
-              OMNIBUS
-            end
-
-            def praefect_omnibus_configuration
-              <<~OMNIBUS
-                #{disable_other_services}
-                gitaly['enable'] = false;
-                praefect['enable'] = true;
-                praefect['listen_addr'] = '0.0.0.0:2305';
-                praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
-                praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
-                praefect['database_host'] = '#{@database}.#{@network}';
-                praefect['database_user'] = 'postgres';
-                praefect['database_port'] = 5432;
-                praefect['database_password'] = 'SQL_PASSWORD';
-                praefect['database_dbname'] = 'praefect_production';
-                praefect['database_sslmode'] = 'disable';
-                praefect['postgres_queue_enabled'] = true;
-                praefect['failover_enabled'] = true;
-                praefect['virtual_storages'] = {
-                  'default' => {
-                    '#{@primary_node}' => {
-                      'address' => 'tcp://#{@primary_node}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN',
-                      'primary' => true
-                    },
-                    '#{@secondary_node}' => {
-                      'address' => 'tcp://#{@secondary_node}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    }
-                  }
-                };
-              OMNIBUS
-            end
-
-            def gitaly_omnibus_configuration
-              <<~OMNIBUS
-                #{disable_other_services}
-                prometheus_monitoring['enable'] = false;
-                gitaly['enable'] = true;
-                gitaly['listen_addr'] = '0.0.0.0:8075';
-                gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
-                gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
-                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
-                gitlab_rails['internal_api_url'] = 'http://#{@gitlab_name}.#{@network}';
-                git_data_dirs({
-                  '#{@primary_node}' => {
-                    'path' => '/var/opt/gitlab/git-data'
-                  },
-                  '#{@secondary_node}' => {
-                    'path' => '/var/opt/gitlab/git-data'
-                  }
-                });
-              OMNIBUS
-            end
-
-            def gitlab_omnibus_configuration
-              <<~OMNIBUS
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://#{@praefect_node}.#{@network}:2305',
-                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
-                  }
-                });
-                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
-              OMNIBUS
-            end
-
-            def gitaly(name, release)
-              Component::Gitlab.perform do |gitaly|
-                gitaly.release = QA::Release.new(release)
-                gitaly.name = name
-                gitaly.network = @network
-                gitaly.skip_availability_check = true
-
-                gitaly.omnibus_config = gitaly_omnibus_configuration
-
-                gitaly.instance do
-                  yield self
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end