gitlab-qa 7.26.0 → 7.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdf52b910858a3f1ec0729d2eef2d170938d282cd116af17af424afc92fcae0
-  data.tar.gz: 1fb9f558a932a9344b774bc3d873e9184f8c31dd8472c4f51aa0a7ac0626422e
+  metadata.gz: 6356f61652597dc3ba035658d378b9dd8567a2caad8406cecfcb333143ac8cc7
+  data.tar.gz: 34f326e02a3934f36255509268c60ba8266d9a0e3ed2f6982a1ce1731db8f8e8
 SHA512:
-  metadata.gz: 3cb4ab49fee9a1ade2abd1125bb5a8ae020c0343a06415d74130709fd5556f715a49010ee6e9b31e1abb9b0c8ece9dc7f3f63e3c85606f21a02434ab276da030
-  data.tar.gz: bd5310d35ede8bef9b8aabc2113a76841a530b11e95e15bc87d82d45e7242b0efb7d6c170f6d2c785d7f7cf8b603c8367dc0b2994f8d1481fff2c8eab8d908a5
+  metadata.gz: fcc680812bf117752fc8e9bab1e02250b426792de13c38a674b5271fa127e8da564cf167b9b53224e4c454e3fc45aec114034a3a2b6a6f86f62149d206da552c
+  data.tar.gz: 9a773c6483cd726f5b84010597ae8729cc514b55f52034223b40c87e01d5409a45ad8ed0674ef89078a368fb62452de4abdcfaefe67af0bd7572733189bb6f55

data/docs/what_tests_can_be_run.md

@@ -637,6 +637,8 @@ container is spun up and tests are run from it by running the
 - `JIRA_ADMIN_USERNAME`: Username for authenticating with Jira server as admin.
 - `JIRA_ADMIN_PASSWORD`: Password for authenticating with Jira server as admin.
 
+These values can be found in the shared GitLab QA 1Password vault.
+
 Example:
 
 ```

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

@@ -146,11 +146,23 @@ module Gitlab
         end
 
         def instance_no_teardown
-          prepare
-          start
-          reconfigure
-          wait_until_ready
-          process_exec_commands
+          begin
+            retries ||= 0
+            prepare
+            start
+            reconfigure
+            wait_until_ready
+            process_exec_commands
+          rescue Docker::Shellout::StatusError => e
+            # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
+            if (retries += 1) < 3
+              puts "Retry instance_no_teardown due to Docker::Shellout::StatusError -- attempt #{retries}"
+              teardown!
+              retry
+            end
+
+            raise e
+          end
 
           yield self if block_given?
         end

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

@@ -157,8 +157,7 @@ module Gitlab
           @docker.attach(name) do |line, wait|
             puts line
             # TODO, workaround which allows to detach from the container
-            #
-            break if line =~ /gitlab Reconfigured!/
+            break if /gitlab Reconfigured!/.match?(line)
           end
         end
 
@@ -166,7 +165,6 @@ module Gitlab
           return if skip_availability_check
 
           if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(Runtime::Env.gitlab_availability_timeout)
-            sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else
             abort ' -> GitLab unavailable!'

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

@@ -84,10 +84,17 @@ module Gitlab
           end
         end
 
+        def full_stacktrace(test)
+          if test.failures.first['message_lines'].empty?
+            test.failures.first['message']
+          else
+            test.failures.first['message_lines'].join("\n")
+          end
+        end
+
         def find_relevant_failure_issues(test) # rubocop:disable Metrics/AbcSize
           ld = Class.new.extend(Gem::Text).method(:levenshtein_distance)
-          full_stacktrace = test.failures.first['message_lines'].join("\n")
-          first_test_failure_stacktrace = sanitize_stacktrace(full_stacktrace, FAILURE_STACKTRACE_REGEX) || full_stacktrace
+          first_test_failure_stacktrace = sanitize_stacktrace(full_stacktrace(test), FAILURE_STACKTRACE_REGEX) || full_stacktrace(test)
           clean_first_test_failure_stacktrace = remove_unique_resource_names(first_test_failure_stacktrace)
 
           # Search with the `search` param returns 500 errors, so we filter by ~QA and then filter further in Ruby
@@ -158,7 +165,7 @@ module Gitlab
         def new_issue_description(test)
           super + [
             "\n\n### Stack trace",
-            "```\n#{test.failures.first['message_lines'].join("\n")}\n```",
+            "```\n#{full_stacktrace(test)}\n```",
             "First happened in #{test.ci_job_url}.",
             "Related test case: #{test.testcase}.",
             screenshot_section(test)
@@ -201,7 +208,9 @@ module Gitlab
         def screenshot_section(test)
           section = ''
 
-          if test.screenshot? && !test.failures.first['message'].include?('500 Internal Server Error')
+          failure = full_stacktrace(test)
+
+          if test.screenshot? && !failure.include?('500 Internal Server Error') && !failure.include?('fabricate_via_api!')
             relative_url = gitlab.upload_file(file_fullpath: test.failure_screenshot)
 
             section = "### Screenshot: #{relative_url.markdown}"

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

@@ -4,10 +4,11 @@ module Gitlab
       module Test
         module Instance
           class Image < Scenario::Template
-            attr_writer :volumes
+            attr_writer :volumes, :seed_admin_token
 
             def initialize
               @volumes = {}
+              @seed_admin_token = true
             end
 
             def perform(release, *rspec_args)
@@ -15,6 +16,7 @@ module Gitlab
                 gitlab.release = release
                 gitlab.volumes = @volumes
                 gitlab.network = 'test'
+                gitlab.seed_admin_token = @seed_admin_token
 
                 gitlab.instance do
                   Component::Specs.perform do |specs|

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

@@ -23,6 +23,7 @@ module Gitlab
                 Scenario::Test::Instance::Image
                   .perform(ce_release.to_ee, *rspec_args) do |scenario|
                   scenario.volumes = volumes
+                  scenario.seed_admin_token = false
                 end
               end
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.26.0'
+    VERSION = '7.27.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.26.0
+  version: 7.27.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control