gitlab-qa 6.7.0 → 6.11.0

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+
 module Gitlab
   module QA
     module Report
@@ -19,6 +21,10 @@ module Gitlab
           self.failures = failures_from_exceptions
         end
 
+        def stage
+          @stage ||= file[%r{(?:api|browser_ui)/(?:(?:\d+_)?(\w+))}, 1]
+        end
+
         def name
           raise NotImplementedError
         end
@@ -46,8 +52,16 @@ module Gitlab
             report['file_path']
           end
 
+          def status
+            report['status']
+          end
+
+          def ci_job_url
+            report['ci_job_url']
+          end
+
           def skipped
-            report['status'] == 'pending'
+            status == 'pending'
           end
 
           def testcase
@@ -58,6 +72,21 @@ module Gitlab
             report['testcase'] = new_testcase
           end
 
+          def failure_issue
+            report['failure_issue']
+          end
+
+          def failure_issue=(new_failure_issue)
+            report['failure_issue'] = new_failure_issue
+          end
+
+          def quarantine?
+            # The value for 'quarantine' could be nil, a hash, a string,
+            # or true (if the test just has the :quarantine tag)
+            # But any non-nil or false value should means the test is in quarantine
+            report['quarantine'].present?
+          end
+
           private
 
           # rubocop:disable Metrics/AbcSize
@@ -71,6 +100,7 @@ module Gitlab
 
               {
                 'message' => "#{exception['class']}: #{exception['message']}",
+                'message_lines' => exception['message_lines'],
                 'stacktrace' => "#{exception['message_lines'].join("\n")}\n#{exception['backtrace'].slice(0..spec_file_first_index).join("\n")}"
               }
             end

data/lib/gitlab/qa/reporter.rb

@@ -4,6 +4,7 @@ module Gitlab
   module QA
     class Reporter
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/PerceivedComplexity
       def self.invoke(args)
         report_options = {}
         slack_options = {}
@@ -21,11 +22,25 @@ module Gitlab
             report_options[:input_files] = files if files
           end
 
-          opts.on('-p', '--project PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --report-in-issues') do |value|
+          opts.on('--relate-failure-issue FILES', String, 'Relate test failures to failure issues from RSpec JSON files') do |files|
+            report_options[:relate_failure_issue] = true
+            report_options[:input_files] = files if files
+          end
+
+          opts.on('--max-diff-ratio DIFF_RATO', Float, 'Max stacktrace diff ratio for QA failure issues detection. Used by with --relate-failure-issue') do |value|
+            report_options[:max_diff_ratio] = value
+          end
+
+          opts.on('-p', '--project PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --report-in-issues and --relate-failure-issue') do |value|
             report_options[:project] = value
           end
 
-          opts.on('-t', '--token ACCESS_TOKEN', String, 'A valid access token. Used by --report-in-issues') do |value|
+          opts.on('--generate-test-session FILES', String, 'Generate test session report') do |files|
+            report_options[:generate_test_session] = true
+            report_options[:input_files] = files if files
+          end
+
+          opts.on('-t', '--token ACCESS_TOKEN', String, 'A valid access token. Required by --report-in-issues and --relate-failure-issue') do |value|
             report_options[:token] = value
           end
 
@@ -45,6 +60,10 @@ module Gitlab
             report_options[:files] = files
           end
 
+          opts.on('--dry-run', "Perform a dry-run (don't create or update issues)") do |files|
+            report_options[:dry_run] = true
+          end
+
           opts.on_tail('-v', '--version', 'Show the version') do
             require 'gitlab/qa/version'
             puts "#{$PROGRAM_NAME} : #{VERSION}"
@@ -63,10 +82,18 @@ module Gitlab
           if report_options.delete(:prepare_stage_reports)
             Gitlab::QA::Report::PrepareStageReports.new(**report_options).invoke!
 
+          elsif report_options.delete(:relate_failure_issue)
+            report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])
+            Gitlab::QA::Report::RelateFailureIssue.new(**report_options).invoke!
+
           elsif report_options.delete(:report_in_issues)
             report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])
             Gitlab::QA::Report::ResultsInIssues.new(**report_options).invoke!
 
+          elsif report_options.delete(:generate_test_session)
+            report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])
+            Gitlab::QA::Report::GenerateTestSession.new(**report_options).invoke!
+
           elsif slack_options.delete(:post_to_slack)
             Gitlab::QA::Slack::PostToSlack.new(**slack_options).invoke!
 
@@ -79,6 +106,7 @@ module Gitlab
           exit 1
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/AbcSize
     end
   end

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

@@ -8,6 +8,7 @@ module Gitlab
 
         # 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
+        # unless they're defined elsewhere (e.g.: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html)
         ENV_VARIABLES = {
           'QA_REMOTE_GRID' => :remote_grid,
           'QA_REMOTE_GRID_USERNAME' => :remote_grid_username,
@@ -62,13 +63,13 @@ 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,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
+          'CI_PROJECT_NAME' => :ci_project_name,
           'GITLAB_CI' => :gitlab_ci,
           'QA_SKIP_PULL' => :qa_skip_pull,
           'ELASTIC_URL' => :elastic_url,
@@ -91,7 +92,10 @@ module Gitlab
           attr_writer(method_name)
 
           define_method(method_name) do
-            ENV[env_name] || instance_variable_get("@#{method_name}")
+            ENV[env_name] ||
+              if instance_variable_defined?("@#{method_name}")
+                instance_variable_get("@#{method_name}")
+              end
           end
         end
 
@@ -123,12 +127,32 @@ module Gitlab
           ENV['CI_PIPELINE_SOURCE']
         end
 
+        def ci_pipeline_url
+          ENV['CI_PIPELINE_URL']
+        end
+
+        def ci_pipeline_id
+          ENV['CI_PIPELINE_ID']
+        end
+
         def ci_project_name
           ENV['CI_PROJECT_NAME']
         end
 
+        def ci_commit_ref_name
+          ENV['CI_COMMIT_REF_NAME']
+        end
+
         def pipeline_from_project_name
-          ci_project_name.to_s.start_with?('gitlab-qa') ? 'master' : ci_project_name
+          if ci_project_name.to_s.start_with?('gitlab-qa')
+            if ENV['TOP_UPSTREAM_SOURCE_JOB'].to_s.start_with?('https://ops.gitlab.net')
+              'staging-orchestrated'
+            else
+              'master'
+            end
+          else
+            ci_project_name
+          end
         end
 
         def run_id
@@ -147,6 +171,14 @@ module Gitlab
           ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
         end
 
+        def qa_issue_url
+          ENV['GITLAB_QA_ISSUE_URL']
+        end
+
+        def deploy_environment
+          ENV['DEPLOY_ENVIRONMENT'] || pipeline_from_project_name
+        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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.11.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.16.1
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -259,10 +259,13 @@ files:
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
 - lib/gitlab/qa/report/base_test_results.rb
+- lib/gitlab/qa/report/generate_test_session.rb
 - lib/gitlab/qa/report/gitlab_issue_client.rb
+- lib/gitlab/qa/report/gitlab_issue_dry_client.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/relate_failure_issue.rb
 - lib/gitlab/qa/report/report_as_issue.rb
 - lib/gitlab/qa/report/results_in_issues.rb
 - lib/gitlab/qa/report/summary_table.rb