Skip to content

[9.3] (backport #18919) Improve xpack integration test UX#18934

Open
mergify[bot] wants to merge 1 commit into9.3from
mergify/bp/9.3/pr-18919
Open

[9.3] (backport #18919) Improve xpack integration test UX#18934
mergify[bot] wants to merge 1 commit into9.3from
mergify/bp/9.3/pr-18919

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 2, 2026

Summary

Three improvements to the Gradle xpack integration test workflow:

  1. Make ES and Filebeat extraction incremental. copyEs and copyFilebeat now declare inputs / outputs so Gradle skips re-extraction when the tar.gz is unchanged.
  2. Support running a single xpack spec via -PrubyIntegrationSpecs= instead of the full qa/integration suite.

How to test this PR locally

  • Run ./gradlew :logstash-xpack:rubyIntegrationTests -PrubyIntegrationSpecs=qa/integration/monitoring/monitoring_is_disabled_spec.rb. Only that spec runs.
  • Run the second time ./gradlew :logstash-xpack:rubyIntegrationTests -PrubyIntegrationSpecs=qa/integration/monitoring/monitoring_is_disabled_spec.rb. ES is NOT re-downloaded on second run.
  • Run ./gradlew :logstash-xpack:rubyIntegrationTests. All specs run. ES and Filebeat extracted correctly.
    This is an automatic backport of pull request Improve xpack integration test UX #18919 done by Mergify.

- Make ES and Filebeat extraction incremental. copyEs and copyFilebeat now declare inputs / outputs so Gradle skips re-extraction when the tar.gz is unchanged.
- Support running a single xpack spec via `-PrubyIntegrationSpecs` to align with core.
Example: `./gradlew :logstash-xpack:rubyIntegrationTests -PrubyIntegrationSpecs=qa/integration/monitoring/monitoring_is_disabled_spec.rb`

(cherry picked from commit fcfcea0)

# Conflicts:
#	x-pack/AGENTS.md
@mergify mergify bot added backport conflicts Detected git conflicts labels Apr 2, 2026
@mergify mergify bot added the backport label Apr 2, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 2, 2026

Cherry-pick of fcfcea0 has failed:

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

You are currently cherry-picking commit fcfcea0c.
  (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:   x-pack/build.gradle
	modified:   x-pack/src/test/java/org/logstash/xpack/test/RSpecIntegrationTests.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/AGENTS.md

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

@mergify mergify bot added the conflicts Detected git conflicts label Apr 2, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 2, 2026

🤖 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.

@mergify mergify bot mentioned this pull request Apr 2, 2026
3 tasks
@elasticmachine
Copy link
Copy Markdown

💛 Build succeeded, but was flaky

Failed CI Steps

cc @kaisecheng

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 6, 2026

This pull request has not been merged yet. Could you please review and merge it @kaisecheng? 🙏

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.

2 participants