ci-queue 0.70.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c364b5557e5b1f4aa031dc23c32afab326e6bda9e3533ee80863682df5ff477c
-  data.tar.gz: cc23906ce01e11a44af734ccb17ba4d566227a3e165d133edf908b20086bb8d7
+  metadata.gz: 2f5093c0f80a695ec2f8b30b8eb72ca58ca809a7e55aa7c0c6177a01acf7ac67
+  data.tar.gz: 53be96ee18a7cdec0ef60d8a367aced59c271e2db2d73c0019a30d50a62d8cce
 SHA512:
-  metadata.gz: 2afc0d0c176bb567e08302ba8ffc5adffe7466f1690d9864be8c50774f19b1ff8b188b9c3cd0665edb0bdddda9a14e48385c22917595c73e02811a9108ff5625
-  data.tar.gz: '086ded1dd94886983620519b535522d959d2e3850c50157592d85f4853a3bd7d4f029324d6b81859a4fbb448cae1045ba33795ae1a6d51d9508c91d77f71a0a9'
+  metadata.gz: 3091461df678a23e28e72b5e35922a51e85aeda474f362ab94ddd49db11420c5a686eb3684313ceda2f7d725d169992ec4f76481eecbc035f6c5c494879c0d8c
+  data.tar.gz: aa81619322c27cc1370da7a2b3c4b9118e2fde8b8401eb13b73788a24cdddab3caab327470baa03968dba04e5b50de8fa28cd0023a8ecccd48ccd81a60f0950f

data/Gemfile.lock

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

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

@@ -56,8 +56,6 @@ module CI
           redis.rpush(key('warnings'), Marshal.dump([type, attributes]))
         end
 
-        Test = Struct.new(:id) # Hack
-
         def record_error(id, payload, stats: nil)
           redis.pipelined do |pipeline|
             @queue.acknowledge(id, error: payload, pipeline: pipeline)
@@ -67,17 +65,23 @@ module CI
           nil
         end
 
-        def record_success(id, stats: nil, skip_flaky_record: false, acknowledge: true)
-          @queue.acknowledge(id) if acknowledge
-          error_reports_deleted_count, requeued_count, _ = redis.pipelined do |pipeline|
-            pipeline.hdel(key('error-reports'), id)
-            pipeline.hget(key('requeues-count'), id)
-            record_stats(stats, pipeline: pipeline)
+        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)
+            transaction.hdel(key('error-reports'), id)
+            transaction.hget(key('requeues-count'), id)
+            record_stats(stats, pipeline: transaction)
           end
           record_flaky(id) if !skip_flaky_record && (error_reports_deleted_count.to_i > 0 || requeued_count.to_i > 0)
           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.70.0'
+    VERSION = '0.72.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,"

metadata

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