From 646d20feefd9180b69cd81f3eef6f813a24164f6 Mon Sep 17 00:00:00 2001 From: ivanovac Date: Mon, 20 Apr 2026 18:16:59 +0300 Subject: [PATCH] Increase JRuby test timeouts for cflinuxfs5 stability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JRuby applications require significant startup time due to JVM initialization and warmup. On resource-constrained CI workers, especially with cflinuxfs5 (Ubuntu 24.04 + OpenJDK 17), startup can exceed 180 seconds, causing flaky test failures. Changes: - Increase CF app timeout: 180s → 300s - Increase test polling timeout: 3min → 5min - Update comments to reflect cflinuxfs5 compatibility This reduces flaky failures while maintaining reasonable test times for apps that are truly broken. Relates to: - PR #1088: Initial timeout increase to 180s - PR #1090: Test polling timeout increase to 3min - PR #1134: OpenJDK cflinuxfs5 support --- fixtures/default/sinatra_jruby/manifest.yml | 2 +- src/ruby/integration/default_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fixtures/default/sinatra_jruby/manifest.yml b/fixtures/default/sinatra_jruby/manifest.yml index c03c2e7dd..438534913 100644 --- a/fixtures/default/sinatra_jruby/manifest.yml +++ b/fixtures/default/sinatra_jruby/manifest.yml @@ -2,4 +2,4 @@ applications: - name: sinatra_jruby_web_app health-check-type: process - timeout: 180 + timeout: 300 diff --git a/src/ruby/integration/default_test.go b/src/ruby/integration/default_test.go index 648a746cc..aa370d022 100644 --- a/src/ruby/integration/default_test.go +++ b/src/ruby/integration/default_test.go @@ -117,8 +117,8 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T Expect(logs).To(ContainLines(MatchRegexp(`Installing jruby \d+\.\d+\.\d+\.\d+`))) // JRuby needs extra time to warm up after health check passes - // Increase timeout to 3 minutes with 2-second intervals for CI environments - Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.7")).WithEndpoint("/ruby"), logs.String()) + // Increased to 5 minutes to accommodate slow/shared CI workers and cflinuxfs5 stack + Eventually(deployment, 5*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.7")).WithEndpoint("/ruby"), logs.String()) }) }) }