ci-queue 0.48.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd20dadd29a542f0876168e23d79e5360f893d780fbe9b4774e5de1a46445da
-  data.tar.gz: 00bdb8f74d38573f2fecea1ee6ce15122e04ecc82642b76f8439d189b0474be3
+  metadata.gz: 946f3f483ffbf8d89553c575d733767bd0851dffaa1439463ce43508f1727eb1
+  data.tar.gz: b74f1059c33686eacc6ef613900595ce8ff74d7fdd55f5f14c856c33fe35c2b3
 SHA512:
-  metadata.gz: 79aaeb1f29291026f8fdf36101b7105fc76845b0e8142eb3cf3400e7905235f8cedc2f71be6819a1c7adbe6b08898e14db0e490214f62cee65f03b8d70e9dac4
-  data.tar.gz: f140a713fbb4f4ad6c2772143e97409f093a1829e6ac86a429036db3d5bc7f8a291e7d304e7314fcadb86d54ff449dfacf486b8318faf2e1b0074556459475c8
+  metadata.gz: 4eca10a80566c11cb600f133008848bde44adec4347f16ec174300e24fb7fafc8727f2dbeae90884b41c60ed784ea8477c5ac896fefac3a7170c84e6b87249fd
+  data.tar.gz: e8e04782df56a2b1cfd873e3ec9295f4e91b848f7f02cc99df41a349a45115a6ceb0fcd2263fc19e54dfe0b72fb870afc80bd74970f443920c0e31a7c5af8937

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.48.0)
+    ci-queue (0.49.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.49.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
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.49.0
 platform: ruby
 authors:
 - Jean Boussier
@@ -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

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