ci-queue 0.27.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d167da0bbe9a7b2eceb992452c71f0fa2ab54c5da53232a5aecbe26426ae8f
-  data.tar.gz: f5130f7ed97545937b5964a92fb107eb462c10eba31fac8d164619ed2351b381
+  metadata.gz: 7d223652a052d2cf2828d73baa3755a832ea90bee64ea40054d3a063ddb1a517
+  data.tar.gz: 69ff5cabeca011f4fa7fee60a534eda64336e9ab4a55e7d660d7c5b0001a0268
 SHA512:
-  metadata.gz: 6304f21d394e7e67f8715d891d77673db0bcd5e0ff6742ec5324b3341982678edb3b7533815cad10ca9aa791f1ee6a84305b9e4390072034a7179a4bf3bece8e
-  data.tar.gz: e49255e12db5ce36f3c1d76376488dd7597b171a4c124b8de7b8c828412be8ffb15e226d16b5b87574eb4631007b3dc868062ec5a8144b5519c1c2beda79cbce
+  metadata.gz: c00238032c5e41dc30f74138cd92dc87523fd1e0386efa839dc4013eeb77640c035df42bfa5296a0ed58fd06fb2e00e1c72a3e05eae5f9a156749128e3b5fe4c
+  data.tar.gz: b1cdabd74fad311aee9ca745d38da22fa0c086f2e8f6a4494fbbd5b4fbab0aa0672d037e2e555843947e5dc5d4a3e66e5297ed7eaf051ec88c07400d57a3b12f

data/Rakefile

@@ -6,7 +6,9 @@ require 'ci/queue/version'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb'] - FileList['test/fixtures/**/*_test.rb']
+  selected_files = ENV["TEST_FILES"].to_s.strip.split(/\s+/)
+  selected_files = nil if selected_files.empty?
+  t.test_files = selected_files || FileList['test/**/*_test.rb'] - FileList['test/fixtures/**/*_test.rb']
 end
 
 task :default => :test

data/dev.yml

@@ -8,4 +8,4 @@ up:
 - isogun
 
 commands:
-  test: REDIS_URL=${REDIS_URL:-redis://ci-queue.railgun/0} bundle exec rake test
+  test: REDIS_URL=${REDIS_URL:-redis://ci-queue.railgun/0} bundle exec rake test TEST_FILES="$*"

data/lib/ci/queue/configuration.rb

@@ -2,7 +2,7 @@
 module CI
   module Queue
     class Configuration
-      attr_accessor :timeout, :worker_id, :max_requeues, :grind_count, :failure_file
+      attr_accessor :timeout, :worker_id, :max_requeues, :grind_count, :failure_file, :export_flaky_tests_file
       attr_accessor :requeue_tolerance, :namespace, :failing_test, :statsd_endpoint
       attr_accessor :max_test_duration, :max_test_duration_percentile, :track_test_duration
       attr_accessor :max_test_failed, :redis_ttl
@@ -35,7 +35,8 @@ module CI
         namespace: nil, seed: nil, flaky_tests: [], statsd_endpoint: nil, max_consecutive_failures: nil,
         grind_count: nil, max_duration: nil, failure_file: nil, max_test_duration: nil,
         max_test_duration_percentile: 0.5, track_test_duration: false, max_test_failed: nil,
-        queue_init_timeout: nil, redis_ttl: 8 * 60 * 60, report_timeout: nil, inactive_workers_timeout: nil
+        queue_init_timeout: nil, redis_ttl: 8 * 60 * 60, report_timeout: nil, inactive_workers_timeout: nil,
+        export_flaky_tests_file: nil
       )
         @build_id = build_id
         @circuit_breakers = [CircuitBreaker::Disabled]
@@ -59,6 +60,7 @@ module CI
         @redis_ttl = redis_ttl
         @report_timeout = report_timeout
         @inactive_workers_timeout = inactive_workers_timeout
+        @export_flaky_tests_file = export_flaky_tests_file
       end
 
       def queue_init_timeout

data/lib/ci/queue/redis/build_record.rb

@@ -48,10 +48,23 @@ module CI
         end
 
         def record_success(id, stats: nil)
-          redis.pipelined do |pipeline|
+          error_reports_deleted_count, requeued_count, _ = redis.pipelined do |pipeline|
             pipeline.hdel(key('error-reports'), id.dup.force_encoding(Encoding::BINARY))
+            pipeline.hget(key('requeues-count'), id.b)
             record_stats(stats, pipeline: pipeline)
           end
+          record_flaky(id) if error_reports_deleted_count.to_i > 0 || requeued_count.to_i > 0
+          nil
+        end
+
+        def record_flaky(id, stats: nil)
+          redis.pipelined do |pipeline|
+            pipeline.sadd?(
+              key('flaky-reports'),
+              id.b
+            )
+            pipeline.expire(key('flaky-reports'), config.redis_ttl)
+          end
           nil
         end
 
@@ -65,6 +78,10 @@ module CI
           redis.hgetall(key('error-reports'))
         end
 
+        def flaky_reports
+          redis.smembers(key('flaky-reports'))
+        end
+
         def fetch_stats(stat_names)
           counts = redis.pipelined do |pipeline|
             stat_names.each { |c| pipeline.hvals(key(c)) }

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.27.0'
+    VERSION = '0.29.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/build_status_reporter.rb

@@ -17,6 +17,10 @@ module Minitest
         build.error_reports.sort_by(&:first).map { |k, v| ErrorReport.load(v) }
       end
 
+      def flaky_reports
+        build.flaky_reports
+      end
+
       def report
         puts aggregates
         errors = error_reports

data/lib/minitest/queue/runner.rb

@@ -213,6 +213,11 @@ module Minitest
           File.write(queue_config.failure_file, failures)
         end
 
+        if queue_config.export_flaky_tests_file
+          failures = reporter.flaky_reports.to_json
+          File.write(queue_config.export_flaky_tests_file, failures)
+        end
+
         reporter.report
         exit! reporter.success? ? 0 : 1
       end
@@ -481,6 +486,15 @@ module Minitest
             queue_config.failure_file = file
           end
 
+          help = <<~EOS
+            Defines a file where flaky tests during the execution are written to in json format.
+            Defaults to disabled.
+          EOS
+          opts.separator ""
+          opts.on('--export-flaky-tests-file FILE', help) do |file|
+            queue_config.export_flaky_tests_file = file
+          end
+
           help = <<~EOS
             Defines after how many consecutive failures the worker will be considered unhealthy and terminate itself.
             Defaults to disabled.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue