ci-queue 0.71.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6f16e56dc8a292221d29e15545c16299885c09e18a5d692aae194e16718c22
-  data.tar.gz: 6b3e65df710c975bae6167659a68d79f3b2c0d8404410c4927b79fe25a2cc298
+  metadata.gz: 32e52b7283478b27a11c44576546f51f05658b891906956f6f590fa4e22a6054
+  data.tar.gz: 72e0ac9ee22984d0d384ca9e9c832be90ee987d237a44fc94b9ed8f7c63823fc
 SHA512:
-  metadata.gz: 53fc80bdaf677cc7c093b07797d8ddca894ba687fd6b10ec600a8707a383ed1bb7afa90c1e6119ee1ebe8d21bc0f95202b449800e53ac9b6c8043f65a1f7c318
-  data.tar.gz: 96f4edf81ea5fdd2de4af18d7d496b25d54c9534251dfd99863003cec89303517abd7fa12495855fad32599271ace91dfec2e08917b6db8877748fc665bb80fc
+  metadata.gz: c33f2ff2045bd8bd2d2b8a3b5cfd00c0f230d5f0d6fe658aef7beb1eb1ef7533da7202d71a533a326a9c5ba629016e7b42cf3f1ceed8f5d8c0eda621e9794d94
+  data.tar.gz: 9271a7d77dd497d1d17f4826b9e21ae7968c821dc570f0c1600803fef6fd27d8d10d1ab753abaaf7f8b2edcfcc22d2649d4075eaa11d7f90ef941f9d02bcfed6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.71.0)
+    ci-queue (0.73.0)
       logger
 
 GEM

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

@@ -57,17 +57,18 @@ module CI
         end
 
         def record_error(id, payload, stats: nil)
-          redis.pipelined do |pipeline|
+          acknowledged, _ = redis.pipelined do |pipeline|
             @queue.acknowledge(id, error: payload, pipeline: pipeline)
             record_stats(stats, pipeline: pipeline)
-            @queue.increment_test_failed(pipeline: pipeline)
           end
+
+          @queue.increment_test_failed if acknowledged == 1
           nil
         end
 
-        def record_success(id, stats: nil, skip_flaky_record: false, acknowledge: true)
+        def record_success(id, stats: nil, skip_flaky_record: false)
           _, error_reports_deleted_count, requeued_count, _ = redis.multi do |transaction|
-            @queue.acknowledge(id, pipeline: transaction) if acknowledge
+            @queue.acknowledge(id, pipeline: transaction)
             transaction.hdel(key('error-reports'), id)
             transaction.hget(key('requeues-count'), id)
             record_stats(stats, pipeline: transaction)
@@ -76,6 +77,12 @@ module CI
           nil
         end
 
+        def record_requeue(id, stats: nil)
+          redis.pipelined do |pipeline|
+           record_stats(stats, pipeline: pipeline)
+          end
+        end
+
         def record_flaky(id, stats: nil)
           redis.pipelined do |pipeline|
             pipeline.sadd?(

data/lib/ci/queue/redis/requeue.lua

@@ -5,6 +5,7 @@ local queue_key = KEYS[3]
 local zset_key = KEYS[4]
 local worker_queue_key = KEYS[5]
 local owners_key = KEYS[6]
+local error_reports_key = KEYS[7]
 
 local max_requeues = tonumber(ARGV[1])
 local global_max_requeues = tonumber(ARGV[2])
@@ -32,6 +33,8 @@ end
 redis.call('hincrby', requeues_count_key, '___total___', 1)
 redis.call('hincrby', requeues_count_key, test, 1)
 
+redis.call('hdel', error_reports_key, test)
+
 local pivot = redis.call('lrange', queue_key, -1 - offset, 0 - offset)[1]
 if pivot then
   redis.call('linsert', queue_key, 'BEFORE', pivot, test)

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

@@ -131,6 +131,7 @@ module CI
               key('running'),
               key('worker', worker_id, 'queue'),
               key('owners'),
+              key('error-reports'),
             ],
             argv: [config.max_requeues, global_max_requeues, test_key, offset],
           ) == 1

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/build_status_recorder.rb

@@ -51,8 +51,10 @@ module Minitest
         stats = COUNTERS.zip(COUNTERS.map { |c| send(c) }).to_h
         if (test.failure || test.error?) && !test.skipped?
           build.record_error("#{test.klass}##{test.name}", dump(test), stats: stats)
+        elsif test.requeued?
+          build.record_requeue("#{test.klass}##{test.name}", stats: stats)
         else
-          build.record_success("#{test.klass}##{test.name}", stats: stats, skip_flaky_record: test.skipped?, acknowledge: !test.requeued?)
+          build.record_success("#{test.klass}##{test.name}", stats: stats, skip_flaky_record: test.skipped?)
         end
       end
 

data/lib/minitest/queue/build_status_reporter.rb

@@ -129,7 +129,7 @@ module Minitest
 
         puts aggregates
 
-        if supervisor.time_left.to_i <= 0
+        if timed_out?
           puts red("Timed out waiting for tests to be executed.")
 
           remaining_tests = supervisor.test_ids
@@ -142,7 +142,7 @@ module Minitest
           end
 
           exit_code = TIMED_OUT_EXIT_CODE
-        elsif supervisor.time_left_with_no_workers.to_i <= 0
+        elsif all_workers_died?
           puts red("All workers died.")
           exit_code = WORKERS_DIED_EXIT_CODE
         elsif supervisor.max_test_failed?
@@ -167,7 +167,11 @@ module Minitest
 
       def success?
         build.error_reports.empty? &&
-          build.worker_errors.empty?
+          build.worker_errors.empty? &&
+          build.queue_exhausted? &&
+          !supervisor.max_test_failed? &&
+          !all_workers_died? &&
+          !timed_out?
       end
 
       def record(*)
@@ -220,6 +224,14 @@ module Minitest
 
       attr_reader :build, :supervisor
 
+      def timed_out?
+        supervisor.time_left.to_i <= 0
+      end
+
+      def all_workers_died?
+        supervisor.time_left_with_no_workers.to_i <= 0
+      end
+
       def aggregates
         success = failures.zero? && errors.zero?
         failures_count = "#{failures} failures, #{errors} errors,"

data/lib/minitest/queue/junit_reporter.rb

@@ -9,7 +9,7 @@ module Minitest
     class JUnitReporter < Minitest::Reporters::BaseReporter
       include ::CI::Queue::OutputHelpers
 
-      def initialize(report_path = 'log/junit.xml', options = {})
+      def initialize(report_path = ENV.fetch("CI_QUEUE_MINITEST_JUNITXML", 'log/junit.xml'), options = {})
         super({})
         @report_path = File.absolute_path(report_path)
         @base_path = options[:base_path] || Dir.pwd

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Jean Boussier