Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 23, 2026

Release notes

[rn:skip]

What does this PR do?

As a follow up to #18471 use gradle as the entrypoint in CI for running acceptance tests. Note that this still uses rake, but it explicitly uses the bundled jruby to invoke it. I did play around a bit with trying to not shell out and instead use jruby through gradle, but I ran in to an issue I have seen before with file descriptors when the ruby code goes to itself shell out (and capture output). Similarly, i looked at using rspec directly and removing rake, but the current rake file does some requires that the rspec code needs. I think leaving this as a rake task is fine and this is a step forward that serves 1. ensuring gradle is "the" interface for orchestration tasks and 2. We use gradle to manage a ruby environment instead of assuming one is on system using the task orchestrator.


This is an automatic backport of pull request #18536 done by Mergify.

* WIP: just test on remote linux box.

* fixup compilation bugs

* actually use it...

* expose rubyUtils methods

* actual gem path

* try to make gems available

* add jruby stdlib gems to gem_path

* try different idea

* try shelling out instead

* use rake still

* revert rubyUtils.gradle changes

* explicitly set BUNDLE_PATH

* dont use deprecated exec

* stop using env var for bundle_path

* unset any bundle related env var before invoking LS

* unset not available on test runners

* document why we shell out

* codereview changes

* make sure BUNDLE_PATH is set after bundle install

(cherry picked from commit 7e9c384)

# Conflicts:
#	qa/rspec/commands/base.rb
@mergify mergify bot added backport conflicts Detected git conflicts labels Jan 23, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 23, 2026

Cherry-pick of 7e9c384 has failed:

On branch mergify/bp/8.19/pr-18536
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 7e9c38455.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   build.gradle
	modified:   ci/acceptance_tests.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qa/rspec/commands/base.rb

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /run exhaustive tests : Run the exhaustive tests Buildkite pipeline.

@donoghuc donoghuc merged commit 1dc535e into 8.19 Jan 23, 2026
10 of 11 checks passed
@donoghuc donoghuc deleted the mergify/bp/8.19/pr-18536 branch January 23, 2026 18:40
@elasticmachine
Copy link

💚 Build Succeeded

History

cc @donoghuc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants