Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixtures/default/sinatra_jruby/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
applications:
- name: sinatra_jruby_web_app
health-check-type: process
timeout: 180
timeout: 300
4 changes: 2 additions & 2 deletions src/ruby/integration/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
})
})
}
Expand Down
Loading