gitlab_quality-test_tooling 1.17.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8709476aafe6dc96d2b49d1d74b18b2e3dbf6c37cb8ebb0acd631d05dbfe2ac
-  data.tar.gz: 26d4d54613a522014b5f3b93f38c0cb62027c2e209573727265a5c2b630a6d9d
+  metadata.gz: 49251bc15b93d718cfff854a53a7a636c0c7146dc5ef10122da6485b61394cbd
+  data.tar.gz: 45aa8dde6575ec5a6aa007caaf2174e7411ce1bbab14a0612c4fc2b052eae803
 SHA512:
-  metadata.gz: 194294ffed245e88a96e35480485f98c1748a8417766cdca1cf737ece2b090a4e29efc444fa449f5f569e292333ba50954f7c07a72fbb2f9225c9195c4b6f411
-  data.tar.gz: 30cc7f3a5da1c15b5c3508e0850c007bddf9f22a85c9ec1361821be7bc330afd3869cd9fe74d3b424afc2d0ad2d180c4c0649b5f502f4740ca68f1b2c8119933
+  metadata.gz: 5b17466220585713a72b202d3760ccc634e0d5cf99696b0e80ef46e3bcd88a57a832dbbcb59d45bf5117bdc5809667a720c0a6c85322820484d2b0446ed40271
+  data.tar.gz: fa1128da178f0744ec2c07544fb316c28e8d8e58e2aa9dff6c8118f6dd4f0ed0ffb84ef3716f08366fef6d2b0f3e0d54023fe287b60a2eea6d0635e8cd74e61d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.17.0)
-      activesupport (>= 6.1, < 7.1)
+    gitlab_quality-test_tooling (1.19.0)
+      activesupport (>= 6.1, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)
       http (~> 5.0)
@@ -16,10 +16,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
@@ -28,7 +33,9 @@ GEM
       tins (~> 1.0)
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark (0.3.0)
+    bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     byebug (11.1.3)
@@ -41,6 +48,7 @@ GEM
     coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.5)
@@ -65,6 +73,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.6.20240107)
+    drb (2.2.1)
     e2mmap (0.1.0)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -119,7 +128,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     json (2.7.1)
@@ -138,10 +147,11 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     mize (0.4.1)
       protocol (~> 2.0)
     multi_xml (0.6.0)
+    mutex_m (0.2.0)
     nap (1.1.0)
     nenv (0.3.0)
     net-http (0.4.1)

data/exe/generate-test-session

@@ -31,6 +31,10 @@ options = OptionParser.new do |opts|
     params[:issue_url_file] = issue_url_file
   end
 
+  opts.on('--pipeline-stages STAGES', String, 'Comma-separated list of pipeline stages to include in test session issue') do |pipeline_stages|
+    params[:pipeline_stages] = pipeline_stages.split(',')
+  end
+
   opts.on('--confidential', "Makes test session issue confidential") do
     params[:confidential] = true
   end

data/lib/gitlab_quality/test_tooling/concerns/find_set_dri.rb

@@ -6,19 +6,23 @@ module GitlabQuality
   module TestTooling
     module Concerns
       module FindSetDri
-        def set_dri_via_group(product_group, stage)
+        def test_dri(product_group, stage, section)
           parse_json_with_sets
+          fetch_section_sets(section)
           fetch_stage_sets(stage)
-
-          return @sets.sample['username'] if @stage_sets.empty?
-
           fetch_group_sets(product_group)
 
-          if @group_sets.empty?
-            @stage_sets.sample['username']
-          else
-            @group_sets.sample['username']
-          end
+          set_dris = if @group_sets.any?
+                       @group_sets
+                     elsif @stage_sets.any?
+                       @stage_sets
+                     elsif @section_sets.any?
+                       @section_sets
+                     else
+                       @sets
+                     end
+
+          set_dris.sample['username']
         end
 
         private
@@ -30,6 +34,14 @@ module GitlabQuality
           @sets = JSON.parse(response.body).select { |user| user['role'].include?('software-engineer-in-test') }
         end
 
+        def fetch_section_sets(section)
+          return if section.nil?
+
+          @section_sets = @sets.select do |user|
+            user['role'].include?(section.split("_").map(&:capitalize).join(" "))
+          end
+        end
+
         def fetch_stage_sets(stage)
           @stage_sets = @sets.select do |user|
             user['role'].include?(stage.split("_").map(&:capitalize).join(" "))

data/lib/gitlab_quality/test_tooling/gitlab_client/gitlab_client.rb

@@ -27,7 +27,7 @@ module GitlabQuality
 
           raise if @retry_backoff > RETRY_BACK_OFF_DELAY * MAX_RETRY_ATTEMPTS
 
-          warn("#{error.class.name} #{error.message}")
+          warn("#{e.class.name} #{e.message}")
           warn("Sleeping for #{@retry_backoff} seconds before retrying...")
           sleep @retry_backoff
 

data/lib/gitlab_quality/test_tooling/report/generate_test_session.rb

@@ -7,15 +7,16 @@ module GitlabQuality
   module TestTooling
     module Report
       class GenerateTestSession < ReportAsIssue
-        def initialize(ci_project_token:, **kwargs)
+        def initialize(ci_project_token:, pipeline_stages: nil, **kwargs)
           super
           @ci_project_token = ci_project_token
+          @pipeline_stages = Set.new(pipeline_stages)
           @issue_type = 'issue'
         end
 
         private
 
-        attr_reader :ci_project_token
+        attr_reader :ci_project_token, :pipeline_stages
 
         # rubocop:disable Metrics/AbcSize
         def run!
@@ -27,6 +28,8 @@ module GitlabQuality
             TestResults::JsonTestResults.new(path).to_a
           end
 
+          tests = tests.select { |test| pipeline_stages.include? test.report["stage"] } unless pipeline_stages.empty?
+
           issue = gitlab.create_issue(
             title: "#{Time.now.strftime('%Y-%m-%d')} Test session report | #{Runtime::Env.qa_run_type}",
             description: generate_description(tests),

data/lib/gitlab_quality/test_tooling/report/relate_failure_issue.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'nokogiri'
-require 'active_support/core_ext/enumerable'
 require 'rubygems/text'
-require 'active_support/core_ext/integer/time'
 require 'amatch'
 
 module GitlabQuality
@@ -330,7 +328,7 @@ module GitlabQuality
         def new_issue_assignee_id(test)
           return unless test.product_group?
 
-          dri = set_dri_via_group(test.product_group, test.stage)
+          dri = test_dri(test.product_group, test.stage, test.section)
           puts "  => Assigning #{dri} as DRI for the issue."
 
           gitlab.find_user_id(username: dri)
@@ -339,7 +337,7 @@ module GitlabQuality
         def new_issue_due_date(test)
           return unless test.product_group?
 
-          Date.today + 1.month
+          Date.today.next_month
         end
 
         def update_reports(issue, test)

data/lib/gitlab_quality/test_tooling/report/report_as_issue.rb

@@ -60,7 +60,6 @@ module GitlabQuality
           | Description | `#{test.name}` |
           | Test level | #{test.level} |
           | Hash | `#{test_hash(test)}` |
-          | Reference duration | #{test.run_time} seconds |
           | Expected duration | < #{test.max_duration_for_test} seconds |
           #{"| Test case | #{test.testcase} |" if test.testcase}
           DESCRIPTION

data/lib/gitlab_quality/test_tooling/report/slow_test_issue.rb

@@ -93,7 +93,7 @@ module GitlabQuality
             current_reports_content: reports_note&.body.to_s,
             test: test,
             reports_section_header: REPORT_SECTION_HEADER,
-            item_extra_content: found_label,
+            item_extra_content: "(#{test.run_time} seconds) #{found_label}",
             reports_extra_content: REPORTS_DOCUMENTATION
           )
         end

data/lib/gitlab_quality/test_tooling/runtime/logger.rb

@@ -38,7 +38,7 @@ module GitlabQuality
               console_log = console_logger(source: source, level: Env.log_level)
               file_log = file_logger(source: source, path: log_path)
 
-              console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+              ActiveSupport::BroadcastLogger.new(console_log, file_log, file_log)
             end
           end
 

data/lib/gitlab_quality/test_tooling/test_meta/processor/add_to_blocking_processor.rb

@@ -17,6 +17,7 @@ module GitlabQuality
               @existing_mrs = nil
               @file_path = spec["file_path"]
               testcase = spec["testcase"]
+              product_section = spec["section"]
               devops_stage = spec["stage"]
               product_group = spec["product_group"]
               @example_name = spec["name"]
@@ -36,7 +37,7 @@ module GitlabQuality
                 #{"Promote to blocking: #{example_name}".truncate(72)}
               COMMIT_MESSAGE
 
-              reviewer_id, assignee_handle = context.fetch_dri_id(product_group, devops_stage)
+              reviewer_id, assignee_handle = context.fetch_dri_id(product_group, devops_stage, product_section)
 
               gitlab_bot_user_id = context.user_id_for_username(Runtime::Env.gitlab_bot_username)
 

data/lib/gitlab_quality/test_tooling/test_meta/test_meta_updater.rb

@@ -190,8 +190,8 @@ module GitlabQuality
         # @param [String] product_group
         # @param [String] devops_stage
         # @return [Array<Integer, String>]
-        def fetch_dri_id(product_group, devops_stage)
-          assignee_handle = ENV.fetch('QA_TEST_DRI_HANDLE', nil) || set_dri_via_group(product_group, devops_stage)
+        def fetch_dri_id(product_group, devops_stage, section)
+          assignee_handle = ENV.fetch('QA_TEST_DRI_HANDLE', nil) || test_dri(product_group, devops_stage, section)
 
           [user_id_for_username(assignee_handle), assignee_handle]
         end

data/lib/gitlab_quality/test_tooling/test_result/base_test_result.rb

@@ -22,6 +22,10 @@ module GitlabQuality
           raise NotImplementedError
         end
 
+        def section
+          raise NotImplementedError
+        end
+
         def category
           raise NotImplementedError
         end

data/lib/gitlab_quality/test_tooling/test_result/json_test_result.rb

@@ -111,6 +111,10 @@ module GitlabQuality
           report['feature_category']
         end
 
+        def section
+          report['section']
+        end
+
         def category
           report['category']
         end

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "1.17.0"
+    VERSION = "1.19.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.19.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -201,7 +201,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement