ci-queue 0.48.0 → 0.50.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: afd20dadd29a542f0876168e23d79e5360f893d780fbe9b4774e5de1a46445da
4
- data.tar.gz: 00bdb8f74d38573f2fecea1ee6ce15122e04ecc82642b76f8439d189b0474be3
3
+ metadata.gz: e1ecedc67f9ee4f238a84a54fd8744c735ca3a7921da2cf45f7c28503449d754
4
+ data.tar.gz: c77c0f29f913c255d7832ccd4c033020752a64e3e7618f2ab5f7848264bfc135
5
5
  SHA512:
6
- metadata.gz: 79aaeb1f29291026f8fdf36101b7105fc76845b0e8142eb3cf3400e7905235f8cedc2f71be6819a1c7adbe6b08898e14db0e490214f62cee65f03b8d70e9dac4
7
- data.tar.gz: f140a713fbb4f4ad6c2772143e97409f093a1829e6ac86a429036db3d5bc7f8a291e7d304e7314fcadb86d54ff449dfacf486b8318faf2e1b0074556459475c8
6
+ metadata.gz: ef3dad131865136444f87e12d402132c501ab0f465a69fc79dafb4d52a8120dbeb13633e2199ca5a482be7d39c2b71ddd480e401ac5ff6d3f7f400438a8025f0
7
+ data.tar.gz: c0a5396a66b11f6de5a2d733a62112e756c2ca2f45dc254996cc65799760790510a68209225a4ab59df4b49b77602d96b7f4ac76db0521a035358842a53d00f9
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- ci-queue (0.48.0)
4
+ ci-queue (0.50.0)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
data/dev.yml CHANGED
@@ -8,4 +8,4 @@ up:
8
8
  - redis
9
9
 
10
10
  commands:
11
- test: REDIS_URL=${REDIS_URL:-redis://ci-queue.railgun/0} bundle exec rake test TEST_FILES="$*"
11
+ test: REDIS_URL=${REDIS_URL} bundle exec rake test TEST_FILES="$*"
@@ -2,7 +2,7 @@
2
2
 
3
3
  module CI
4
4
  module Queue
5
- VERSION = '0.48.0'
5
+ VERSION = '0.50.0'
6
6
  DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
7
7
  RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
8
8
  end
@@ -49,7 +49,8 @@ module Minitest
49
49
 
50
50
  def run_command
51
51
  require_worker_id!
52
- if queue.retrying? || retry?
52
+ # if it's an automatic job retry we should process the main queue
53
+ if manual_retry?
53
54
  if queue.expired?
54
55
  abort! "The test run is too old and can't be retried"
55
56
  end
@@ -181,10 +182,10 @@ module Minitest
181
182
  def bisect_command
182
183
  invalid_usage! "Missing the FAILING_TEST argument." unless queue_config.failing_test
183
184
 
184
- @queue = CI::Queue::Bisect.new(queue_url, queue_config)
185
- Minitest.queue = queue
186
185
  set_load_path
187
186
  load_tests
187
+ @queue = CI::Queue::Bisect.new(queue_url, queue_config)
188
+ Minitest.queue = queue
188
189
  populate_queue
189
190
 
190
191
  step("Testing the failing test in isolation")
@@ -671,6 +672,12 @@ module Minitest
671
672
  exit! exit_status # exit! is required to avoid minitest at_exit callback
672
673
  end
673
674
 
675
+ def manual_retry?
676
+ # this env variable only exists on Buildkite so we should default to manual for backward compatibility
677
+ (retry? || queue.retrying?) &&
678
+ ENV.fetch("BUILDKITE_RETRY_TYPE", "manual") == "manual"
679
+ end
680
+
674
681
  def retry?
675
682
  ENV["BUILDKITE_RETRY_COUNT"].to_i > 0 ||
676
683
  ENV["SEMAPHORE_PIPELINE_RERUN"] == "true"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ci-queue
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.48.0
4
+ version: 0.50.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jean Boussier
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-04-02 00:00:00.000000000 Z
11
+ date: 2024-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -173,7 +173,6 @@ files:
173
173
  - dev.yml
174
174
  - exe/minitest-queue
175
175
  - exe/rspec-queue
176
- - isogun.yml
177
176
  - lib/ci/queue.rb
178
177
  - lib/ci/queue/bisect.rb
179
178
  - lib/ci/queue/build_record.rb
@@ -243,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
243
242
  - !ruby/object:Gem::Version
244
243
  version: '0'
245
244
  requirements: []
246
- rubygems_version: 3.5.7
245
+ rubygems_version: 3.5.9
247
246
  signing_key:
248
247
  specification_version: 4
249
248
  summary: Distribute tests over many workers using a queue
data/isogun.yml DELETED
@@ -1,10 +0,0 @@
1
- # This file is for Shopify employees development environment.
2
- # If you are an external contributor you don't have to bother with it.
3
- name: ci-queue
4
-
5
- vm:
6
- ip_address: 192.168.64.245
7
- memory: 1G
8
- cores: 2
9
- services:
10
- - redis