gitlab_quality-test_tooling 1.18.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948fbcd939a7800a4538113fddc717642c4d9fed7dab6d650cd9052c1832f19b
-  data.tar.gz: fbc4cee23cbcd3f7631ac6a03d41f2b8e287590777fef813289013d982efc4f7
+  metadata.gz: beeb1678e873990d65b474eeda84dd957becfa69e7868d83d9db5394aa9e71be
+  data.tar.gz: 8a932d572750522124c0fa24950db55a1d9e5de66e476cde0f1c17a7fb16f9d0
 SHA512:
-  metadata.gz: 34c8a65eaf48e4ef9800df34a66f0086d3915252444091631fbd76273731008f70be149e3c92d5954644e55839d8a314eb3442411e3a389061e460d66c9d1ea2
-  data.tar.gz: 29f34824d1c5bba8dbe979a10c0e93a8c4c06e7b0b174b96b0150c19e3d6f71bb0fa9a8ef285a2d650af407547084a5e1a7bb2925817dce5d200b6755e864d4c
+  metadata.gz: a5bf865481746bcf4e54d10e2b19b5b8ac63aefb151eb285b47566aae82e3fcf7d30ccd90603bc8a44c3fa06996f4a6bc3486575fe6aa002cf596f4e5bd0e366
+  data.tar.gz: bc1857f7fbf20040a2c4c0e4c696b3d31410b07b664f5aedcc2a5535d8c5e1ec1e5e52b8dda6fe906b1253ba218615cfbe9cb2234c130de27f3d605e8979fcff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.18.0)
+    gitlab_quality-test_tooling (1.19.1)
       activesupport (>= 6.1, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)

data/exe/generate-test-session

@@ -31,7 +31,7 @@ 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|
+  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
 

data/lefthook.yml

@@ -17,7 +17,8 @@ pre-push:
     # Changelog git trailer for the first commit of the branch
     changelog-on-first-commit:
       run: |
-        first_commit_message=$(git log --format=%B -n 1 $(git log main..HEAD --pretty=format:"%h" | tail -1))
+        git fetch origin main
+        first_commit_message=$(git log --format=%B -n 1 $(git log origin/main..HEAD --pretty=format:"%h" | tail -1))
         if ! echo ${first_commit_message} | grep "Changelog:"; then
           echo Could not find a Changelog: git trailer on the first commit for this branch.
           echo

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,15 @@ module GitlabQuality
           @sets = JSON.parse(response.body).select { |user| user['role'].include?('software-engineer-in-test') }
         end
 
+        def fetch_section_sets(section)
+          @section_sets = []
+          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/report/relate_failure_issue.rb

@@ -328,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)

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.18.0"
+    VERSION = "1.19.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control