ci-queue 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a7fd6d204f0b946f8bc4007e1e948473cfecdcc9b822790f9832f1f2f726f6
-  data.tar.gz: 80c7105ad884094d737ddcf140e2a491f5d84af71c83856ad6d1382d7fea39b7
+  metadata.gz: c9c3ef16af71af28cb4ba0a1b1cc6333549b29c59be0b4a5d81d04820c2b9b09
+  data.tar.gz: 3b7f66435ec75625bb68af73917bea553815ac76f526efb0bb954252fac35bc3
 SHA512:
-  metadata.gz: 567e793b6d5114a37570fe3834966562aae6f1ba23484c2dfdb02dcaa6689aa8c6b4b35d5c705936273809af4abfe6f236c821eb655f9aed9f5af599faeb0b72
-  data.tar.gz: 62bd24aafeaf69fd5e308f9a253e66c602b2fca3e0760572afe467f989ab1a2397edc37f7bdf60df662d00dedda43f2004b20c8bec971b0cf48b92452b50a6a2
+  metadata.gz: 110d276a4d4a44cf98cba68be7e895991d510e14236fdad601fc9887ea13f6b1f67b3ec3df48b5210cac8b2185be2528cd39c1c9da67a0649660300594801878
+  data.tar.gz: 103c204787a1f3b29e9ebb676f5847eac789acd806f5eaabbce84a5e2f47e6af27ea48d7a6f6d725c25dbf78061d38e5cb10feb62586a0b8d0ea1d32f5230af5

data/ci-queue.gemspec

@@ -27,10 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
   spec.add_dependency 'ansi'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', "~> 10.0"
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
   spec.add_development_dependency 'rspec', '~> 3.7.0'
   spec.add_development_dependency 'redis', '~> 3.3'

data/lib/ci/queue/circuit_breaker.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module CI
   module Queue
-    class CircuitBreaker
+    module CircuitBreaker
       module Disabled
         extend self
 
@@ -50,25 +50,27 @@ module CI
         end
       end
 
-      def initialize(max_consecutive_failures:)
-        @max = max_consecutive_failures
-        @consecutive_failures = 0
-      end
+      class MaxConsecutiveFailures
+        def initialize(max_consecutive_failures:)
+          @max = max_consecutive_failures
+          @consecutive_failures = 0
+        end
 
-      def report_failure!
-        @consecutive_failures += 1
-      end
+        def report_failure!
+          @consecutive_failures += 1
+        end
 
-      def report_success!
-        @consecutive_failures = 0
-      end
+        def report_success!
+          @consecutive_failures = 0
+        end
 
-      def open?
-        @consecutive_failures >= @max
-      end
+        def open?
+          @consecutive_failures >= @max
+        end
 
-      def message
-        'This worker is exiting early because it encountered too many consecutive test failures, probably because of some corrupted state.'
+        def message
+          'This worker is exiting early because it encountered too many consecutive test failures, probably because of some corrupted state.'
+        end
       end
     end
   end

data/lib/ci/queue/configuration.rb

@@ -2,10 +2,12 @@
 module CI
   module Queue
     class Configuration
-      attr_accessor :timeout, :build_id, :worker_id, :max_requeues, :grind_count, :failure_file
-      attr_accessor :requeue_tolerance, :namespace, :seed, :failing_test, :statsd_endpoint
+      attr_accessor :timeout, :worker_id, :max_requeues, :grind_count, :failure_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
       attr_reader :circuit_breakers
+      attr_writer :seed, :build_id
 
       class << self
         def from_env(env)
@@ -30,30 +32,31 @@ module CI
         timeout: 30, build_id: nil, worker_id: nil, max_requeues: 0, requeue_tolerance: 0,
         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_duration_percentile: 0.5, track_test_duration: false, max_test_failed: nil
       )
-        @circuit_breakers = [CircuitBreaker::Disabled]
         @build_id = build_id
+        @circuit_breakers = [CircuitBreaker::Disabled]
         @failure_file = failure_file
         @flaky_tests = flaky_tests
         @grind_count = grind_count
         @max_requeues = max_requeues
+        @max_test_duration = max_test_duration
+        @max_test_duration_percentile = max_test_duration_percentile
+        @max_test_failed = max_test_failed
         @namespace = namespace
         @requeue_tolerance = requeue_tolerance
         @seed = seed
         @statsd_endpoint = statsd_endpoint
         @timeout = timeout
-        @worker_id = worker_id
-        @max_test_duration = max_test_duration
-        @max_test_duration_percentile = max_test_duration_percentile
         @track_test_duration = track_test_duration
-        self.max_duration = max_duration
+        @worker_id = worker_id
         self.max_consecutive_failures = max_consecutive_failures
+        self.max_duration = max_duration
       end
 
       def max_consecutive_failures=(max)
         if max
-          @circuit_breakers << CircuitBreaker.new(max_consecutive_failures: max)
+          @circuit_breakers << CircuitBreaker::MaxConsecutiveFailures.new(max_consecutive_failures: max)
         end
       end
 

data/lib/ci/queue/output_helpers.rb

@@ -8,8 +8,8 @@ module CI
 
       private
 
-      def step(*args)
-        ci_provider.step(*args)
+      def step(*args, **kwargs)
+        ci_provider.step(*args, **kwargs)
       end
 
       def reopen_previous_step

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

@@ -61,6 +61,20 @@ module CI
           end
         end
 
+        def increment_test_failed
+          redis.incr(key('test_failed_count'))
+        end
+
+        def test_failed
+          redis.get(key('test_failed_count')).to_i
+        end
+
+        def max_test_failed?
+          return false if config.max_test_failed.nil?
+
+          test_failed >= config.max_test_failed
+        end
+
         private
 
         attr_reader :redis, :redis_url

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

@@ -54,6 +54,12 @@ module CI
           nil
         end
 
+        def max_test_failed?
+          return false if config.max_test_failed.nil?
+
+          @queue.test_failures >= config.max_test_failed
+        end
+
         def error_reports
           redis.hgetall(key('error-reports'))
         end
@@ -62,7 +68,10 @@ module CI
           counts = redis.pipelined do
             stat_names.each { |c| redis.hvals(key(c)) }
           end
-          stat_names.zip(counts.map { |values| values.map(&:to_f).inject(:+).to_f }).to_h
+          sum_counts = counts.map do |values|
+            values.map(&:to_f).inject(:+).to_f
+          end
+          stat_names.zip(sum_counts).to_h
         end
 
         def reset_stats(stat_names)

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

@@ -22,7 +22,7 @@ module CI
           yield if block_given?
 
           time_left = config.timeout
-          until exhausted? || time_left <= 0
+          until exhausted? || time_left <= 0 || max_test_failed?
             sleep 1
             time_left -= 1
 

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

@@ -15,6 +15,7 @@ module CI
         attr_reader :total
 
         def initialize(redis, config)
+          @last_warning = nil
           @reserved_test = nil
           @shutdown_required = false
           super(redis, config)
@@ -45,7 +46,7 @@ module CI
 
         def poll
           wait_for_master
-          until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted?
+          until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted? || max_test_failed?
             if test = reserve
               yield index.fetch(test), @last_warning
             else

data/lib/ci/queue/static.rb

@@ -50,7 +50,7 @@ module CI
       end
 
       def poll
-        while !config.circuit_breakers.any?(&:open?) && test = @queue.shift
+        while config.circuit_breakers.none?(&:open?) && !max_test_failed? && test = @queue.shift
           yield index.fetch(test)
         end
       end
@@ -64,9 +64,24 @@ module CI
         true
       end
 
+      def increment_test_failed
+        @test_failed = test_failed + 1
+      end
+
+      def test_failed
+        @test_failed ||= 0
+      end
+
+      def max_test_failed?
+        return false if config.max_test_failed.nil?
+
+        test_failed >= config.max_test_failed
+      end
+
       def requeue(test)
         test_key = test.id
         return false unless should_requeue?(test_key)
+
         requeues[test_key] += 1
         @queue.unshift(test_key)
         true

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue.rb

@@ -88,6 +88,7 @@ module Minitest
     end
 
     def flaked?
+      @flaky ||= false
       !!((Flaked === failure) || @flaky)
     end
 
@@ -153,6 +154,10 @@ module Minitest
         if queue.config.circuit_breakers.any?(&:open?)
           STDERR.puts queue.config.circuit_breakers.map(&:message).join(' ').strip
         end
+
+        if queue.max_test_failed?
+          STDERR.puts 'This worker is exiting early because too many failed tests were encountered.'
+        end
       else
         super
       end
@@ -174,7 +179,9 @@ module Minitest
           queue.report_success!
         end
 
+        requeued = false
         if failed && queue.requeue(example)
+          requeued = true
           result.requeue!
           reporter.record(result)
         elsif queue.acknowledge(example) || !failed
@@ -182,6 +189,10 @@ module Minitest
           # Then we only record it if it is successful.
           reporter.record(result)
         end
+
+        if !requeued && failed
+          queue.increment_test_failed
+        end
       end
     end
   end

data/lib/minitest/queue/failure_formatter.rb

@@ -27,6 +27,7 @@ module Minitest
           test_line: test_line,
           test_and_module_name: "#{test.klass}##{test.name}",
           test_name: test.name,
+          error_class: test.failure.exception.class.name,
           output: to_s,
         }
       end

data/lib/minitest/queue/runner.rb

@@ -181,7 +181,13 @@ module Minitest
           end
 
           unless supervisor.exhausted?
-            abort! "#{supervisor.size} tests weren't run."
+            msg = "#{supervisor.size} tests weren't run."
+            if supervisor.max_test_failed?
+              puts('Encountered too many failed tests. Test run was ended early.')
+              puts(msg)
+            else
+              abort!(msg)
+            end
           end
         end
 
@@ -399,6 +405,15 @@ module Minitest
             queue_config.max_duration = max
           end
 
+          help = <<~EOS
+            Defines how many user test tests can be fail.
+            Defaults to none.
+          EOS
+          opts.separator ""
+          opts.on('--max-test-failed MAX', Integer, help) do |max|
+            queue_config.max_test_failed = max
+          end
+
           help = <<~EOS
             Defines how many requeues can happen overall, based on the test suite size. e.g 0.05 for 5%.
             Defaults to 0.

data/lib/minitest/queue/statsd.rb

@@ -19,7 +19,7 @@ module Minitest
           @socket = UDPSocket.new
           @socket.connect(host, Integer(port))
         end
-      rescue SocketError => e
+      rescue SocketError
         # No-op, we shouldn't fail CI because of statsd
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,8 @@ files:
 homepage: https://github.com/Shopify/ci-queue
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: