From f07d633b837203fda4406d04ff6f652b5d76063c Mon Sep 17 00:00:00 2001 From: Schneems Date: Mon, 11 Nov 2024 13:13:49 -0600 Subject: [PATCH 1/4] Emit log order Issue #1505 spells out a problem where it appears ci-queue does not fail even when the test suite is broken. I'm unsure why this happens. To debug I'm emitting the tests that run so I can audit to make sure `rspec ./spec/helpers/yarn_installer_spec.rb:6` is executed. If it's not, then I need to diagnose why. If it is, then perhaps there some ordering bug that's affecting the outcome. --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index f0c801d15..514ddad23 100644 --- a/app.json +++ b/app.json @@ -20,7 +20,7 @@ }, "scripts": { "test-setup": "bundle exec rake hatchet:setup_ci", - "test": "bundle exec rspec-queue --max-requeues=3 --timeout 180 --queue $REDIS_URL || { cat log/test_order.log; $(exit 1); }" + "test": "bundle exec rspec-queue --max-requeues=3 --timeout 180 --queue $REDIS_URL --format documentation || { cat log/test_order.log; $(exit 1); }" }, "buildpacks": [ { From b98633fe739d7699ed95d1a3caf2eeebc2745edc Mon Sep 17 00:00:00 2001 From: Schneems Date: Mon, 11 Nov 2024 16:41:14 -0600 Subject: [PATCH 2/4] Update CI-queue --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c0085fa5..3b8c07b69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - ci-queue (0.55.0) + ci-queue (0.58.0) citrus (3.0.2) connection_pool (2.4.1) dead_end (4.0.0) From 862fcc301ec57315ceb579b108daad561406a787 Mon Sep 17 00:00:00 2001 From: Schneems Date: Tue, 12 Nov 2024 11:23:26 -0600 Subject: [PATCH 3/4] Update redis version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3b8c07b69..0e280a541 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM rate_throttle_client (~> 0.1.0) rake (13.2.1) rate_throttle_client (0.1.2) - redis (5.2.0) + redis (5.3.0) redis-client (>= 0.22.0) redis-client (0.22.2) connection_pool From 2aaad670e6cd85ddf96cfbe8d03f855261d10c75 Mon Sep 17 00:00:00 2001 From: Schneems Date: Tue, 12 Nov 2024 11:50:08 -0600 Subject: [PATCH 4/4] Use branch of ci-queue --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c887ccc55..593368af1 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ group :development, :test do gem "parallel_tests" gem 'rspec-retry' gem 'json' - gem 'ci-queue' + gem 'ci-queue', github: "schneems/ci-queue", branch: "schneems/allow-hosted-redis" gem 'redis' gem 'dead_end' end diff --git a/Gemfile.lock b/Gemfile.lock index 0e280a541..41807c869 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,15 @@ +GIT + remote: https://github.com/schneems/ci-queue.git + revision: 285353ba8bc58e1b2ed02dedf55730400c27e32b + branch: schneems/allow-hosted-redis + specs: + ci-queue (0.58.0) + logger + GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - ci-queue (0.58.0) citrus (3.0.2) connection_pool (2.4.1) dead_end (4.0.0) @@ -23,6 +30,7 @@ GEM thor (~> 1) threaded (~> 0) json (2.7.2) + logger (1.6.1) moneta (1.0.0) multi_json (1.15.0) parallel (1.25.1) @@ -57,7 +65,7 @@ PLATFORMS ruby DEPENDENCIES - ci-queue + ci-queue! dead_end excon heroku_hatchet