Skip to content

Backport PR #16499 to 8.15: Don't use an older JRuby with oraclelinux-7#16502

Merged
dliappis merged 1 commit into8.15from
backport_16499_8.15
Oct 2, 2024
Merged

Backport PR #16499 to 8.15: Don't use an older JRuby with oraclelinux-7#16502
dliappis merged 1 commit into8.15from
backport_16499_8.15

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Oct 2, 2024

Backport PR #16499 to 8.15 branch, original message:


Release notes

[rn:skip]

What does this PR do?

A recent PR (elastic/ci-agent-images/pull/932) modernized the VM images and removed JRuby 9.4.5.0 and some older versions.

This ended up breaking exhaustive test on Oracle Linux 7 that hard coded JRuby 9.4.5.0.

PR #16489 worked around the problem by pinning to the new JRuby, but actually we don't need the conditional anymore since the original issue jruby/jruby#7579 (comment) has been resolved and none of our releasable branches (apart from 7.17 which uses 9.2.20.1) specify 9.3.x.y in /.ruby-version.

Therefore, this commit removes conditional setting of JRuby for OracleLinux 7 agents in exhaustive tests (and relies on whatever /.ruby-version defines).

Why is it important/What is the impact to the user?

Removes tech debt and simplifies the CI invocation of exhaustive/acceptance tests.

How to test this PR locally

https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/769

Related issues

A recent PR (elastic/ci-agent-images/pull/932) modernized the VM images
and removed JRuby 9.4.5.0 and some older versions.

This ended up breaking exhaustive test on Oracle Linux 7 that hard coded
JRuby 9.4.5.0.

PR #16489 worked around the
problem by pinning to the new JRuby, but actually we don't
need the conditional anymore since the original issue
jruby/jruby#7579 (comment) has
been resolved and none of our releasable branches (apart from 7.17 which
uses `9.2.20.1`) specify `9.3.x.y` in `/.ruby-version`.

Therefore, this commit removes conditional setting of JRuby for
OracleLinux 7 agents in exhaustive tests (and relies on whatever
`/.ruby-version` defines).

(cherry picked from commit 07c01f8)
Copy link
Copy Markdown
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean PR, will merge when CI is green

@dliappis dliappis merged commit d085559 into 8.15 Oct 2, 2024
@elastic-sonarqube
Copy link
Copy Markdown

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

@donoghuc donoghuc deleted the backport_16499_8.15 branch November 21, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants