ci-queue 0.48.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd20dadd29a542f0876168e23d79e5360f893d780fbe9b4774e5de1a46445da
-  data.tar.gz: 00bdb8f74d38573f2fecea1ee6ce15122e04ecc82642b76f8439d189b0474be3
+  metadata.gz: e1ecedc67f9ee4f238a84a54fd8744c735ca3a7921da2cf45f7c28503449d754
+  data.tar.gz: c77c0f29f913c255d7832ccd4c033020752a64e3e7618f2ab5f7848264bfc135
 SHA512:
-  metadata.gz: 79aaeb1f29291026f8fdf36101b7105fc76845b0e8142eb3cf3400e7905235f8cedc2f71be6819a1c7adbe6b08898e14db0e490214f62cee65f03b8d70e9dac4
-  data.tar.gz: f140a713fbb4f4ad6c2772143e97409f093a1829e6ac86a429036db3d5bc7f8a291e7d304e7314fcadb86d54ff449dfacf486b8318faf2e1b0074556459475c8
+  metadata.gz: ef3dad131865136444f87e12d402132c501ab0f465a69fc79dafb4d52a8120dbeb13633e2199ca5a482be7d39c2b71ddd480e401ac5ff6d3f7f400438a8025f0
+  data.tar.gz: c0a5396a66b11f6de5a2d733a62112e756c2ca2f45dc254996cc65799760790510a68209225a4ab59df4b49b77602d96b7f4ac76db0521a035358842a53d00f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.48.0)
+    ci-queue (0.50.0)
 
 GEM
   remote: https://rubygems.org/

data/dev.yml

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

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/runner.rb

@@ -49,7 +49,8 @@ module Minitest
 
       def run_command
         require_worker_id!
-        if queue.retrying? || retry?
+        # if it's an automatic job retry we should process the main queue
+        if manual_retry?
           if queue.expired?
             abort! "The test run is too old and can't be retried"
           end
@@ -181,10 +182,10 @@ module Minitest
       def bisect_command
         invalid_usage! "Missing the FAILING_TEST argument." unless queue_config.failing_test
 
-        @queue = CI::Queue::Bisect.new(queue_url, queue_config)
-        Minitest.queue = queue
         set_load_path
         load_tests
+        @queue = CI::Queue::Bisect.new(queue_url, queue_config)
+        Minitest.queue = queue
         populate_queue
 
         step("Testing the failing test in isolation")
@@ -671,6 +672,12 @@ module Minitest
         exit! exit_status # exit! is required to avoid minitest at_exit callback
       end
 
+      def manual_retry?
+        # this env variable only exists on Buildkite so we should default to manual for backward compatibility
+        (retry? || queue.retrying?) &&
+          ENV.fetch("BUILDKITE_RETRY_TYPE", "manual") == "manual"
+      end
+
       def retry?
         ENV["BUILDKITE_RETRY_COUNT"].to_i > 0 ||
           ENV["SEMAPHORE_PIPELINE_RERUN"] == "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,6 @@ files:
 - dev.yml
 - exe/minitest-queue
 - exe/rspec-queue
-- isogun.yml
 - lib/ci/queue.rb
 - lib/ci/queue/bisect.rb
 - lib/ci/queue/build_record.rb
@@ -243,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue

data/isogun.yml

@@ -1,10 +0,0 @@
-# This file is for Shopify employees development environment.
-# If you are an external contributor you don't have to bother with it.
-name: ci-queue
-
-vm:
-  ip_address: 192.168.64.245
-  memory: 1G
-  cores: 2
-services:
-   - redis