gitlab-qa 6.18.0 → 6.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 014047f45483ab38a1539c030e55befbefc7ff264ea49c7e53c627aba510d5f6
-  data.tar.gz: bcb812ddf34170c933bbf8ca3318668bd9c31516ad0648d7928c1643c038e61e
+  metadata.gz: c136a0788938d35b97aa2ead0aeb2c1cf49a3d4b88234b84bdc63fca74077f9c
+  data.tar.gz: 3af3761d7ec9c0b454f213a3adaba033d72f9eefa96551a7027d858a6a022c50
 SHA512:
-  metadata.gz: b6b61b590269a367d50aab150815ed437ec0754020443e5f1852243f938de59ac55b7777cfea5cb2b32b580b4a0f9ad97a0180dbe2a8c809cb558b93f428b03f
-  data.tar.gz: 90c3e08ee021157f991fcef5cc94e0a9691d2d673314f6c9dd75d6183b0b6c5c0eeeb5e7cb1fa442cee549e5d721b0af032a14dda84ad56870f40fa8107cb026
+  metadata.gz: 73fefa1d944152d2792b353ee133846d077ffdae97f706fe20011d6327e82a9a627b301933b814eb214f5206566855c5a212af2bb7b56cee8a845fd3943e29c4
+  data.tar.gz: a4375e5f172c5c578f5fd389d1f3012247688c76b33465e44459581e2b126805a3d85bc851c70755bb4c850e26b3df186d97868a2d7ad37987e822608a412f99

data/.gitlab-ci.yml

@@ -1023,7 +1023,7 @@ relate_test_failures:
       when: always
   variables:
     QA_FAILURES_REPORTING_PROJECT: "gitlab-org/gitlab"
-    QA_FAILURES_MAX_DIFF_RATIO: "0.05"
+    QA_FAILURES_MAX_DIFF_RATIO: "0.15"
     # The --dry-run can be set to modify the behavior of `exe/gitlab-qa-report --relate-failure-issue` without releasing a new gem version.
     QA_FAILURES_REPORTER_OPTIONS: ""
   script:

data/docs/what_tests_can_be_run.md

@@ -84,6 +84,8 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `CACHE_NAMESPACE_NAME` | `true` | Cache namespace name for groups. | No|
 | `DEPLOY_VERSION` |- | The version of GitLab being tested against. | No|
 | `GITLAB_QA_USER_AGENT` |- | The browser user-agent to use instead of the default Chrome user-agent. | No|
+| `GEO_FAILOVER` | `false` | Set to `true` when a Geo secondary site has been promoted to a Geo primary site. | No|
+
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 

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

@@ -30,7 +30,6 @@ module Gitlab
           @skip_availability_check = false
 
           @volumes[GITLAB_CERTIFICATES_PATH] = SSL_PATH
-          @volumes[TRUSTED_CERTIFICATES_PATH] = TRUSTED_PATH
 
           self.release = 'CE'
         end
@@ -72,6 +71,11 @@ module Gitlab
         def mtls
           @volumes.delete(GITLAB_CERTIFICATES_PATH)
           @volumes[GITALY_CERTIFICATES_PATH] = SSL_PATH
+          set_trusted_certificates
+        end
+
+        def set_trusted_certificates
+          @volumes[TRUSTED_CERTIFICATES_PATH] = TRUSTED_PATH
         end
 
         def relative_path

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

@@ -17,8 +17,6 @@ module Gitlab
           @docker = Docker::Engine.new
           @volumes = {}
           @env = {}
-
-          @volumes[TRUSTED_CERTIFICATES_PATH] = TRUSTED_PATH
         end
 
         def perform # rubocop:disable Metrics/AbcSize
@@ -67,6 +65,10 @@ module Gitlab
           end
         end
 
+        def mtls
+          @volumes[TRUSTED_CERTIFICATES_PATH] = TRUSTED_PATH
+        end
+
         private
 
         def args_with_flags(args, feature_flag_set)

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

@@ -23,9 +23,11 @@ module Gitlab
           )
 
           # Workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/295493
-          gitlab.create_issue_note(
-            iid: issue.iid,
-            note: "/relate #{Runtime::Env.qa_issue_url}")
+          unless Runtime::Env.qa_issue_url.to_s.empty?
+            gitlab.create_issue_note(
+              iid: issue.iid,
+              note: "/relate #{Runtime::Env.qa_issue_url}")
+          end
 
           File.write('REPORT_ISSUE_URL', issue.web_url)
         end

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

@@ -9,7 +9,7 @@ module Gitlab
     module Report
       # Uses the API to create or update GitLab issues with the results of tests from RSpec report files.
       class RelateFailureIssue < ReportAsIssue
-        DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.05
+        DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.15
         FAILURE_STACKTRACE_REGEX = %r{((.*Failure\/Error:(?<stacktrace>.+))|(?<stacktrace>.+))}m.freeze
         ISSUE_STACKTRACE_REGEX = /### Stack trace\s*(```)#{FAILURE_STACKTRACE_REGEX}(```)/m.freeze
         NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::investigating priority::2]).freeze

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

@@ -87,7 +87,8 @@ module Gitlab
           'JIRA_ADMIN_PASSWORD' => :jira_admin_password,
           'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
           'DEPLOY_VERSION' => :deploy_version,
-          'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent
+          'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
+          'GEO_FAILOVER' => :geo_failover
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -283,6 +284,10 @@ module Gitlab
           enabled?(ENV['QA_SKIP_PULL'], default: false)
         end
 
+        def geo_failover?
+          enabled?(ENV['GEO_FAILOVER'], default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

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

@@ -4,12 +4,20 @@ module Gitlab
       module Test
         module Instance
           ##
-          # Run test suite against staging.gitlab.com
+          # Run test suite against staging.gitlab.com (or geo.staging.gitlab.com during failover)
           #
           class Staging < DeploymentBase
             def deployment_component
               Component::Staging
             end
+
+            def non_rspec_args
+              if Runtime::Env.geo_failover?
+                [deployment_component::GEO_SECONDARY_ADDRESS]
+              else
+                [deployment_component::ADDRESS]
+              end
+            end
           end
         end
       end

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

@@ -34,6 +34,7 @@ module Gitlab
                     gitlab.set_accept_insecure_certs
                     gitlab.omnibus_config = gitlab_omnibus
                     gitlab.tls = true
+                    gitlab.set_trusted_certificates
 
                     gitlab.instance do
                       puts "Running mTLS specs!"
@@ -49,6 +50,7 @@ module Gitlab
                         specs.network = gitlab.network
                         specs.args = [gitlab.address, *rspec_args]
                         specs.env = @env
+                        specs.mtls
                       end
                     end
                   end

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

@@ -27,7 +27,7 @@ module Gitlab
                       nginx['listen_port'] = 80;
                       nginx['listen_https'] = false;
                       # documentation: https://docs.gitlab.com/omnibus/settings/database.html#seed-the-database-fresh-installs-only
-                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password}'
+                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password!}'
 
                       registry_external_url '#{tunnel_registry.url}';
                       registry_nginx['listen_port'] = 80;

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.18.0'.freeze
+    VERSION = '6.20.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.18.0
+  version: 6.20.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control