gitlab-qa 6.4.1 → 6.9.0

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

@@ -19,6 +19,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 +50,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 +70,14 @@ 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
+
           private
 
           # rubocop:disable Metrics/AbcSize
@@ -71,6 +91,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,28 @@ 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 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 +167,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/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_until_ready
-                    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_until_ready
-
-                    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/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.4.1'.freeze
+    VERSION = '6.9.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.9.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-11-13 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
@@ -258,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
@@ -288,6 +292,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