gitlab-qa 6.3.0 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c99ceb7cdd5d4c53dabf353157bbaf334c7c67febb2afc93620e8bca0fe3774
-  data.tar.gz: a0d26ee7c892402f37cb9bc0e311f649687878fb088bca8c881ce64a5a0bcd54
+  metadata.gz: 1615e54144d0b669245a15b6a5874efc1d00157fe859dbc6ff2e723380e9da10
+  data.tar.gz: f3ccd0528987c838c793d1bbc2f742833584756bf7a87c58c29b60fa2f7b6ac3
 SHA512:
-  metadata.gz: 6984d1bcbfb7939d2b806f9857b6403db776458eba0c89ee719be35f563b4a96076a80ca2cf8bb765e4eccf819e7554343c59b08c702d8d45d4d0c85bcde618c
-  data.tar.gz: 4c44818ae663d2eece632825d8efd12535312f71a98e7211ab8b431b8dec5d8561d339a1b69e3884797f3324cb049b64164da4be4c0064c329de600cf731d020
+  metadata.gz: 47fce0af7a769ccb9dca14c87f3d1f169495324f753f3db60bb8aa10fc6e05a4612f0bc1704e884dca3d7349bd6d0972d5ca77421bba71f60fd03258e24bc52b
+  data.tar.gz: f1d65176693a0091989392eec19425a34d2cbc1ee92cb428178ee22ca438b19e7246fd1306bfdaaa73f5d531a6c01ad5a6b2ee1324ca72ef0ba9b255ae4782f3

data/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - notify
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.7
   tags:
     - gitlab-org
   cache:
@@ -729,6 +729,44 @@ ee:packages-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Packages"
 
+ce:actioncable:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Actioncable"
+
+ce:actioncable-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Actioncable"
+
+ee:actioncable:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Actioncable"
+
+ee:actioncable-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Actioncable"
+
 ee:elasticsearch:
   extends:
     - .test

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/mast
 - Checklist after merging:
   - [ ] [Create a tag for the new release version](docs/release_process.md#how-to).
 
-/label ~Quality ~backstage
+/label ~Quality ~"feature::maintenance"

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 require:
   # Due to a probably bug in rubocop (https://github.com/bbatsov/rubocop/issues/5251)
   # we need to require rubocop-rspec a second time so that RSpec/FilePath does

data/.rubocop_todo.yml

@@ -0,0 +1,98 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-10-31 07:26:03 -0700 using RuboCop version 0.82.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 51
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 210
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/gitlab/qa/component/staging.rb'
+    - 'lib/gitlab/qa/runtime/scenario.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/gitlab/qa/component/staging.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
+  Exclude:
+    - 'lib/gitlab/qa/component/gitlab.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+RSpec/EmptyLineAfterLetBlock:
+  Exclude:
+    - 'spec/gitlab/qa/support/dev_eeqa_image_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: CustomTransform, IgnoredWords.
+RSpec/ExampleWording:
+  Exclude:
+    - 'spec/gitlab/qa/component/gitlab_spec.rb'
+
+# Offense count: 2
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
+
+# Offense count: 93
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/HashTransformKeys:
+  Exclude:
+    - 'lib/gitlab/qa/docker/volumes.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/gitlab/qa/component/gitlab.rb'
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/runtime/env.rb'
+    - 'lib/gitlab/qa/runtime/scenario.rb'
+    - 'lib/gitlab/qa/scenario/test/omnibus/upgrade.rb'
+    - 'lib/gitlab/qa/support/http_request.rb'
+
+# Offense count: 1
+Style/MethodMissingSuper:
+  Exclude:
+    - 'lib/gitlab/qa/runtime/scenario.rb'
+
+# Offense count: 1
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/gitlab/qa/runtime/scenario.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'db/migrate/**/*'
+    - 'db/post_migrate/**/*'
+    - 'db/geo/migrate/**/*'
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/report/update_screenshot_path.rb'

data/docs/what_tests_can_be_run.md

@@ -545,6 +545,23 @@ $ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
 $ gitlab-qa Test::Integration::Jira EE
 ```
 
+### `Test::Integration::Actioncable CE|EE|<full image address>`
+
+This tests the real-time assignees feature by setting
+`actioncable['enable'] = true` in the Omnibus configuration
+before starting the GitLab container.
+
+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 `--tag actioncable` RSpec parameter,
+which runs only the tests with `:actioncable` metadata.
+
+Example:
+
+```
+$ gitlab-qa Test::Integration::Actioncable CE
+```
+
 ### `Test::Instance::Any CE|EE|<full image address>:nightly|latest|any_tag http://your.instance.gitlab`
 
 This tests that a live GitLab instance works as expected by running tests

data/gitlab-qa.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
 
   # Some dependencies are pinned, to prevent new cops from breaking the CI pipelines
   spec.add_development_dependency 'climate_control', '~> 0.2'
-  spec.add_development_dependency 'gitlab-styles', '2.4.0'
+  spec.add_development_dependency 'gitlab-styles', '~> 4.3.0'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 12.2'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
-  spec.add_development_dependency 'rubocop-rspec', '1.20.1'
+  spec.add_development_dependency 'rubocop', '~> 0.82.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
   spec.add_development_dependency 'webmock', '3.7.0'
   spec.add_runtime_dependency 'activesupport', '~>  6.0.2'
   spec.add_runtime_dependency 'gitlab', '~>  4.11.0'

data/lib/gitlab/qa.rb

@@ -39,6 +39,7 @@ module Gitlab
         end
 
         module Integration
+          autoload :Actioncable, 'gitlab/qa/scenario/test/integration/actioncable'
           autoload :Geo, 'gitlab/qa/scenario/test/integration/geo'
           autoload :LDAP, 'gitlab/qa/scenario/test/integration/ldap'
           autoload :LDAPNoTLS, 'gitlab/qa/scenario/test/integration/ldap_no_tls'
@@ -98,6 +99,7 @@ module Gitlab
 
     module Report
       autoload :GitlabIssueClient, 'gitlab/qa/report/gitlab_issue_client'
+      autoload :BaseTestResults, 'gitlab/qa/report/base_test_results'
       autoload :JsonTestResults, 'gitlab/qa/report/json_test_results'
       autoload :JUnitTestResults, 'gitlab/qa/report/junit_test_results'
       autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'

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

@@ -61,7 +61,7 @@ module Gitlab
         end
 
         def prepare_network
-          if runner_network && !docker.network_exists?(runner_network)
+          if runner_network && !docker.network_exists?(runner_network) # rubocop:disable Style/IfUnlessModifier
             docker.network_create("--driver=bridge --internal #{runner_network}")
           end
 

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

@@ -128,10 +128,10 @@ module Gitlab
           end
         end
 
-        def wait
+        def wait_until_ready
           return if skip_availability_check
 
-          if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(180)
+          if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(300)
             sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else

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

@@ -30,7 +30,8 @@ module Gitlab
           begin
             run_psql 'template1'
           rescue StandardError
-            retry if Time.now - start < 30
+            sleep 5
+            retry if Time.now - start < 60
             raise
           end
         end

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

@@ -27,7 +27,7 @@ module Gitlab
               end
             end
 
-            if wait.value.exited? && wait.value.exitstatus.nonzero?
+            if wait.value.exited? && wait.value.exitstatus.nonzero? # rubocop:disable Style/IfUnlessModifier
               raise StatusError, "Docker command `#{@command.mask_secrets}` failed!"
             end
           end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Report
+      class BaseTestResults
+        include Enumerable
+
+        def initialize(path)
+          @results = parse(path)
+          @testcases = process
+        end
+
+        def each(&block)
+          testcases.each(&block)
+        end
+
+        def write(path)
+          raise NotImplementedError
+        end
+
+        private
+
+        attr_reader :results, :testcases
+
+        def parse(path)
+          raise NotImplementedError
+        end
+
+        def process
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

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

@@ -5,15 +5,23 @@ require 'json'
 module Gitlab
   module QA
     module Report
-      class JsonTestResults
-        include Enumerable
+      class JsonTestResults < BaseTestResults
+        def write(path)
+          json = results.merge('examples' => testcases.map(&:report))
 
-        def initialize(file)
-          @testcases = JSON.parse(File.read(file))['examples'].map { |test| TestResult.from_json(test) }
+          File.write(path, JSON.pretty_generate(json))
         end
 
-        def each(&block)
-          @testcases.each(&block)
+        private
+
+        def parse(path)
+          JSON.parse(File.read(path))
+        end
+
+        def process
+          results['examples'].map do |test|
+            TestResult.from_json(test)
+          end
         end
       end
     end

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

@@ -5,15 +5,21 @@ require 'nokogiri'
 module Gitlab
   module QA
     module Report
-      class JUnitTestResults
-        include Enumerable
+      class JUnitTestResults < BaseTestResults
+        def write(path)
+          # Ignore it for now
+        end
+
+        private
 
-        def initialize(file)
-          @testcases = Nokogiri::XML(File.read(file)).xpath('//testcase').map { |test| TestResult.from_junit(test) }
+        def parse(path)
+          Nokogiri::XML.parse(File.read(path))
         end
 
-        def each(&block)
-          @testcases.each(&block)
+        def process
+          results.xpath('//testcase').map do |test|
+            TestResult.from_junit(test)
+          end
         end
       end
     end

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

@@ -15,15 +15,15 @@ module Gitlab
         def run!
           puts "Reporting test results in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
 
-          Dir.glob(files).each do |file|
-            puts "Reporting tests in #{file}"
-            extension = File.extname(file)
+          Dir.glob(files).each do |path|
+            puts "Reporting tests in #{path}"
+            extension = File.extname(path)
 
             case extension
             when '.json'
-              test_results = Report::JsonTestResults.new(file)
+              test_results = Report::JsonTestResults.new(path)
             when '.xml'
-              test_results = Report::JUnitTestResults.new(file)
+              test_results = Report::JUnitTestResults.new(path)
             else
               raise "Unknown extension #{extension}"
             end
@@ -31,6 +31,8 @@ module Gitlab
             test_results.each do |test|
               report_test(test)
             end
+
+            test_results.write(path)
           end
         end
 
@@ -48,6 +50,8 @@ module Gitlab
             puts "Created new issue: #{issue.web_url}"
           end
 
+          test.testcase ||= issue.web_url
+
           update_labels(issue, test)
           note_status(issue, test)
 

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

@@ -4,60 +4,114 @@ module Gitlab
   module QA
     module Report
       class TestResult
-        attr_accessor :name, :file, :skipped, :failures, :testcase
-
-        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.testcase = test['testcase']
-          end
+        def self.from_json(report)
+          JsonTestResult.new(report)
         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
+        def self.from_junit(report)
+          JUnitTestResult.new(report)
         end
 
-        def self.failures_from_json_exceptions(test)
-          return [] unless test.key?('exceptions')
+        attr_accessor :report, :failures
 
-          test['exceptions'].map do |exception|
-            spec_file_first_index = exception['backtrace'].rindex do |line|
-              line.include?(File.basename(test['file_path']))
-            end
+        def initialize(report)
+          self.report = report
+          self.failures = failures_from_exceptions
+        end
 
-            {
-              'message' => "#{exception['class']}: #{exception['message']}",
-              'stacktrace' => "#{exception['message_lines'].join("\n")}\n#{exception['backtrace'].slice(0..spec_file_first_index).join("\n")}"
-            }
-          end
+        def name
+          raise NotImplementedError
         end
-        private_class_method :failures_from_json_exceptions
 
-        def self.failures_from_junit_exceptions(test)
-          failures = test.search('failure')
-          return [] if failures.empty?
+        def file
+          raise NotImplementedError
+        end
+
+        def skipped
+          raise NotImplementedError
+        end
+
+        private
+
+        def failures_from_exceptions
+          raise NotImplementedError
+        end
+
+        class JsonTestResult < TestResult
+          def name
+            report['full_description']
+          end
+
+          def file
+            report['file_path']
+          end
+
+          def skipped
+            report['status'] == 'pending'
+          end
+
+          def testcase
+            report['testcase']
+          end
 
-          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']))
+          def testcase=(new_testcase)
+            report['testcase'] = new_testcase
+          end
+
+          private
+
+          # rubocop:disable Metrics/AbcSize
+          def failures_from_exceptions
+            return [] unless report.key?('exceptions')
+
+            report['exceptions'].map do |exception|
+              spec_file_first_index = exception['backtrace'].rindex do |line|
+                line.include?(File.basename(report['file_path']))
+              end
+
+              {
+                'message' => "#{exception['class']}: #{exception['message']}",
+                'stacktrace' => "#{exception['message_lines'].join("\n")}\n#{exception['backtrace'].slice(0..spec_file_first_index).join("\n")}"
+              }
             end
+          end
+          # rubocop:enable Metrics/AbcSize
+        end
+
+        class JUnitTestResult < TestResult
+          def name
+            report['name']
+          end
 
-            {
-              'message' => "#{exception['type']}: #{exception['message']}",
-              'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
-            }
+          def file
+            report['file']
+          end
+
+          def skipped
+            report.search('skipped').any?
+          end
+
+          attr_accessor :testcase # Ignore it for now
+
+          private
+
+          def failures_from_exceptions
+            failures = report.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(report['file']))
+              end
+
+              {
+                'message' => "#{exception['type']}: #{exception['message']}",
+                'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
+              }
+            end
           end
         end
-        private_class_method :failures_from_junit_exceptions
       end
     end
   end

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

@@ -62,6 +62,8 @@ module Gitlab
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'CI' => :ci,
+          'CI_JOB_ID' => :ci_job_id,
+          'CI_JOB_URL' => :ci_job_url,
           'CI_RUNNER_ID' => :ci_runner_id,
           'CI_SERVER_HOST' => :ci_server_host,
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
@@ -85,8 +87,12 @@ module Gitlab
           'DEPLOY_VERSION' => :deploy_version
         }.freeze
 
-        ENV_VARIABLES.each_value do |accessor|
-          send(:attr_accessor, accessor) # rubocop:disable GitlabSecurity/PublicSend
+        ENV_VARIABLES.each do |env_name, method_name|
+          attr_writer(method_name)
+
+          define_method(method_name) do
+            ENV[env_name] || instance_variable_get("@#{method_name}")
+          end
         end
 
         def gitlab_username
@@ -113,10 +119,6 @@ module Gitlab
           ENV['CI_JOB_TOKEN']
         end
 
-        def ci_job_url
-          ENV['CI_JOB_URL']
-        end
-
         def ci_pipeline_source
           ENV['CI_PIPELINE_SOURCE']
         end
@@ -125,30 +127,14 @@ module Gitlab
           ENV['CI_PROJECT_NAME']
         end
 
-        def ci_slack_webhook_url
-          ENV['CI_SLACK_WEBHOOK_URL']
-        end
-
         def pipeline_from_project_name
           ci_project_name.to_s.start_with?('gitlab-qa') ? 'master' : ci_project_name
         end
 
-        def slack_qa_channel
-          ENV['SLACK_QA_CHANNEL']
-        end
-
-        def slack_icon_emoji
-          ENV['SLACK_ICON_EMOJI']
-        end
-
         def run_id
           @run_id ||= "gitlab-qa-run-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(4)}"
         end
 
-        def qa_access_token
-          ENV['GITLAB_QA_ACCESS_TOKEN']
-        end
-
         def dev_access_token_variable
           env_value_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
@@ -228,10 +214,6 @@ module Gitlab
           enabled?(ENV['QA_SKIP_PULL'], default: false)
         end
 
-        def gitlab_qa_formless_login_token
-          env_value_if_defined('GITLAB_QA_FORMLESS_LOGIN_TOKEN')
-        end
-
         private
 
         def enabled?(value, default: true)

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

@@ -0,0 +1,36 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Actioncable < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.name = 'gitlab-actioncable'
+                gitlab.network = 'test'
+                gitlab.omnibus_config = <<~OMNIBUS
+                  actioncable['enable'] = true;
+                OMNIBUS
+
+                gitlab.instance do
+                  puts "Running actioncable specs!"
+
+                  rspec_args << "--" unless rspec_args.include?('--')
+                  rspec_args << %w[--tag actioncable]
+
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Instance::All'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,8 @@ module Gitlab
               @database = 'postgres'
               @spec_suite = 'Test::Instance::All'
               @network = 'test'
+              @env = {}
+              @tag = 'gitaly_cluster'
             end
 
             # rubocop:disable Metrics/AbcSize
@@ -51,14 +53,17 @@ module Gitlab
                 gitlab.instance do
                   puts "Running Gitaly Cluster specs!"
 
-                  rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag gitaly_cluster]
+                  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

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

@@ -3,105 +3,62 @@ module Gitlab
     module Scenario
       module Test
         module Integration
-          class Praefect < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
-            def perform(release, *rspec_args)
-              Docker::Volumes.new.with_temporary_volumes do |volumes|
-                # Create the Praefect database before enabling Praefect
-                Component::Gitlab.perform do |gitlab|
-                  gitlab.release = QA::Release.new(release)
-                  gitlab.name = 'gitlab'
-                  gitlab.network = 'test'
-                  gitlab.volumes = volumes
-                  gitlab.exec_commands = [
-                    'gitlab-psql -d template1 -c "CREATE DATABASE praefect_production OWNER gitlab"',
-                    'mkdir -p /var/opt/gitlab/git-data/repositories/praefect',
-                    'chown -R git:root /var/opt/gitlab/git-data/repositories'
-                  ]
+          class Praefect < GitalyCluster
+            attr_reader :gitlab_name, :spec_suite
 
-                  gitlab.act do
-                    prepare
-                    start
-                    reconfigure
-                    process_exec_commands
-                    wait
-                    teardown!
-                  end
-                end
+            def initialize
+              super
 
-                # Restart GitLab with Praefect enabled and then run the tests
-                Component::Gitlab.perform do |gitlab|
-                  gitlab.release = QA::Release.new(release)
-                  gitlab.name = 'gitlab'
-                  gitlab.network = 'test'
-                  gitlab.volumes = volumes
-                  gitlab.omnibus_config = omnibus_config_with_praefect
-
-                  gitlab.act do
-                    prepare_gitlab_omnibus_config
-                    start
-                    reconfigure
-                    wait
-
-                    puts "Running Praefect specs!"
-
-                    Component::Specs.perform do |specs|
-                      specs.suite = 'Test::Instance::All'
-                      specs.release = gitlab.release
-                      specs.network = gitlab.network
-                      specs.args = [gitlab.address, *rspec_args]
-                      specs.env = { QA_PRAEFECT_REPOSITORY_STORAGE: 'default' }
-                    end
-
-                    teardown
-                  end
-                end
-              end
+              @tag = nil
+              @env = { QA_PRAEFECT_REPOSITORY_STORAGE: 'default' }
             end
-            # rubocop:enable Metrics/AbcSize
-
-            private
 
-            def omnibus_config_with_praefect
+            def gitlab_omnibus_configuration
               <<~OMNIBUS
-                gitaly['enable'] = true;
+                external_url 'http://#{@gitlab_name}.#{@network}';
+
+                git_data_dirs({
+                  'default' => {
+                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                  },
+                  'gitaly' => {
+                    'gitaly_address' => 'tcp://#{@gitlab_name}.#{@network}:8075',
+                    'path' => '/var/opt/gitlab/git-data'
+                  }
+                });
                 gitaly['listen_addr'] = '0.0.0.0:8075';
                 gitaly['auth_token'] = 'secret-token';
                 gitaly['storage'] = [
-                  {
-                    'name' => 'praefect-gitaly-0',
-                    'path' => '/var/opt/gitlab/git-data/repositories/praefect'
-                  },
                   {
                     'name' => 'gitaly',
-                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
+                    'path' => '/var/opt/gitlab/git-data/repositories'
                   }
                 ];
-                praefect['enable'] = true;
-                praefect['listen_addr'] = '0.0.0.0:2305';
-                praefect['auth_token'] = 'secret-token';
-                praefect['virtual_storages'] = {
-                  'default' => {
-                    'praefect-gitaly-0' => {
-                      'address' => 'tcp://localhost:8075',
-                      'token'   => 'secret-token',
-                      'primary' => true
-                    }
-                  }
-                };
-                praefect['database_host'] = '/var/opt/gitlab/postgresql';
-                praefect['database_user'] = 'gitlab';
-                praefect['database_dbname'] = 'praefect_production';
-                praefect['postgres_queue_enabled'] = true;
                 gitlab_rails['gitaly_token'] = 'secret-token';
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://localhost:2305'
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                prometheus['scrape_configs'] = [
+                  {
+                    'job_name' => 'praefect',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@praefect_node_name}.#{@network}:9652'
+                      ]
+                    ]
                   },
-                  'gitaly' => {
-                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
+                  {
+                    '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
           end

data/lib/gitlab/qa/scenario/test/omnibus/image.rb

@@ -15,7 +15,7 @@ module Gitlab
                   reconfigure
 
                   restart
-                  wait
+                  wait_until_ready
                   teardown
                 end
               end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.3.0'.freeze
+    VERSION = '6.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.7.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -28,16 +28,16 @@ dependencies:
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '1.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - ".gitlab/merge_request_templates/Release.md"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -257,6 +258,7 @@ files:
 - lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
+- lib/gitlab/qa/report/base_test_results.rb
 - lib/gitlab/qa/report/gitlab_issue_client.rb
 - lib/gitlab/qa/report/json_test_results.rb
 - lib/gitlab/qa/report/junit_test_results.rb
@@ -287,6 +289,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
+- lib/gitlab/qa/scenario/test/integration/actioncable.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb