gitlab_quality-test_tooling 2.24.1 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b18e1abd81ec1c5b3c2d215c28fe53d68880a94d76b12c8693afb64d4b3cc9c2
-  data.tar.gz: f9b3ede1d0e05492f9395ffedfd3132ee528df4343074a89518cffe1521f466d
+  metadata.gz: 00140ea21de2c5a562b7eaf3af41ee5d304a60d9bf73fb812a7e08fa04170a5e
+  data.tar.gz: 9e8cdf91f59d43b782872ee3c625e21d0c00381feb260ab95454fd5d3cb920c7
 SHA512:
-  metadata.gz: 4f36f26d06eda97591aa4b46b5beb6db2563b269cc97e8cc987b6fb17310e836efeb2b600fef03a0d70305fbf82282bc251a6206c1e7123b80500fe3f6d6b6d5
-  data.tar.gz: 53f3dd0472c5539605440db234c7c6b3f361831af54e418dbc482a5ae9b608b33179c9bdc2d671fe2b0a99b11b873433c2fe3c8b6c0d0394fae2a58021fd7f08
+  metadata.gz: 2e9561c50c8b365001cce2047d448a403c2f5de4ee3ee35841c4ce2e2d2748ca17c135b0b9e5b22389e9245a0922a6171fb99705016040a4206c139d3a3033f5
+  data.tar.gz: 88359d86bf0cdb99b48d748570a39fa6fd3a73d9908c352d3bd956f9fea7f6c4b8d880763b2e6bccd10fa439e211bc139ea2f952952b7cef7b2e9107a7c8f31f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (2.24.1)
+    gitlab_quality-test_tooling (2.25.0)
       activesupport (>= 7.0, < 7.3)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)

data/exe/test-coverage

@@ -15,29 +15,21 @@ require_relative '../lib/gitlab_quality/test_tooling/code_coverage/rspec_report'
 require_relative '../lib/gitlab_quality/test_tooling/code_coverage/test_map'
 
 params = {}
-required_params = [:working_dir, :rspec_reports_jobs, :rspec_reports_glob, :coverage_report_path, :test_map_url]
+required_params = [:rspec_reports, :coverage_report, :test_map]
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
-  opts.on('--working_dir PATH', 'Working directory path') do |path|
-    params[:working_dir] = path
+  opts.on('--rspec-reports GLOB', 'Glob pattern for RSpec JSON reports (e.g., "rspec/rspec-*.json")') do |pattern|
+    params[:rspec_reports] = pattern
   end
 
-  opts.on('--rspec-reports-jobs JOB1,...', Array, 'Comma-separated names of RSpec JSON jobs') do |jobs|
-    params[:rspec_reports_jobs] = jobs
+  opts.on('--coverage-report PATH', 'Path to the LCOV coverage report (e.g., "coverage/lcov/gitlab.lcov")') do |path|
+    params[:coverage_report] = path
   end
 
-  opts.on('--rspec-reports-glob GLOB', 'Glob pattern for RSpec JSON reports') do |pattern|
-    params[:rspec_reports_glob] = pattern
-  end
-
-  opts.on('--coverage-report-path PATH', 'Path to LCOV coverage report') do |path|
-    params[:coverage_report_path] = path
-  end
-
-  opts.on('--test-map-url URL', 'URL for the test map') do |url|
-    params[:test_map_url] = url
+  opts.on('--test-map PATH', 'Path to the test map file (e.g., "crystalball/packed-mapping.json.gz")') do |path|
+    params[:test_map] = path
   end
 
   opts.on('-h', '--help', 'Show the usage') do
@@ -58,11 +50,9 @@ end
 
 if params.any? && (required_params - params.keys).none?
   artifacts = GitlabQuality::TestTooling::CodeCoverage::Artifacts.new(
-    working_dir: params[:working_dir],
-    rspec_reports_jobs: params[:rspec_reports_jobs],
-    rspec_reports_glob: params[:rspec_reports_glob],
-    coverage_report_path: params[:coverage_report_path],
-    test_map_url: params[:test_map_url]
+    rspec_reports: params[:rspec_reports],
+    coverage_report: params[:coverage_report],
+    test_map: params[:test_map]
   )
 
   coverage_report = artifacts.coverage_report

data/lib/gitlab_quality/test_tooling/code_coverage/artifacts.rb

@@ -1,27 +1,22 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'net/http'
 require 'stringio'
-require 'uri'
 require 'zlib'
 
-require_relative 'utils'
-
 module GitlabQuality
   module TestTooling
     module CodeCoverage
       class Artifacts
-        include Utils
-
-        MAX_RETRIES = 7 # retries with exponential backoff: 1s, 2s, 4s, 8s, 16s, 32s, 64s (+ 0-1s jitter)
-
-        def initialize(working_dir:, coverage_report_path:, rspec_reports_jobs:, rspec_reports_glob:, test_map_url:)
-          @working_dir = working_dir
-          @rspec_reports_jobs = rspec_reports_jobs
-          @rspec_reports_glob = rspec_reports_glob
-          @coverage_report_path = coverage_report_path
-          @test_map_uri = URI.parse(test_map_url)
+        # Loads coverage artifacts from the filesystem
+        #
+        # @param rspec_reports [String] Glob pattern for RSpec JSON report files (e.g., "rspec/rspec-*.json")
+        # @param coverage_report [String] Path to the LCOV coverage report file (e.g., "coverage/lcov/gitlab.lcov")
+        # @param test_map [String] Path to the test map file, gzipped or plain JSON (e.g., "crystalball/packed-mapping.json.gz")
+        def initialize(rspec_reports:, coverage_report:, test_map:)
+          @rspec_reports_glob = rspec_reports
+          @coverage_report_path = coverage_report
+          @test_map_path = test_map
         end
 
         def rspec_reports
@@ -37,20 +32,16 @@ module GitlabQuality
         end
 
         def test_map
-          @test_map ||= fetch_test_map_from_url
+          @test_map ||= fetch_test_map
         end
 
         private
 
         def rspec_reports_paths
           @rspec_reports_paths ||= begin
-            paths = @rspec_reports_jobs.flat_map do |job_name|
-              Dir.glob(File.join(@working_dir, job_name, @rspec_reports_glob))
-            end.compact
+            paths = Dir.glob(@rspec_reports_glob)
 
-            if paths.empty? || paths.none? { |path| File.exist?(path) } # rubocop:disable Style/IfUnlessModifier
-              raise "No RSpec reports found in #{@working_dir}/<job-name>/ for these jobs: #{@rspec_reports_jobs}."
-            end
+            raise "No RSpec reports found matching pattern: #{@rspec_reports_glob}" if paths.empty?
 
             paths
           end
@@ -62,30 +53,18 @@ module GitlabQuality
           File.read(@coverage_report_path)
         end
 
-        def fetch_test_map_from_url
-          attempt = 0
+        def fetch_test_map
+          raise "Test map file not found: #{@test_map_path}" unless File.exist?(@test_map_path)
 
           begin
-            attempt += 1
-            response = http_get(@test_map_uri)
-            raise "HTTP #{response.code}: #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+            content = File.read(@test_map_path)
 
-            JSON.parse(decompressed_gzip(response.body))
-          rescue StandardError => e
-            if attempt <= MAX_RETRIES
-              sleep_duration = exponential_delay_with_jitter(attempt)
-              warn "Attempt #{attempt}/#{MAX_RETRIES} failed: #{e.message}. Retrying in #{sleep_duration.round(2)}s..."
-              sleep(sleep_duration)
-              retry
-            end
-
-            raise "Failed to fetch test map from #{@test_map_uri} after #{MAX_RETRIES} attempts: #{e.message}"
-          end
-        end
+            # If it's a gzipped file, decompress it
+            content = decompressed_gzip(content) if @test_map_path.end_with?('.gz')
 
-        def http_get(uri)
-          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-            http.get(uri.request_uri)
+            JSON.parse(content)
+          rescue StandardError => e
+            raise "Failed to read test map from #{@test_map_path}: #{e.message}"
           end
         end
 

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "2.24.1"
+    VERSION = "2.25.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 2.24.1
+  version: 2.25.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-24 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control