Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2025

What does this PR do?

Makes tests which compare data emitted by beats processes and beats receivers to ignore differences in the agent version.

Why is it important?

These values can be different when the version has been bumped in beats, but the respective commit hasn't been pulled in as a dependency. We shouldn't block CI in that case.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

This is an automatic backport of pull request #10851 done by [Mergify](https://mergify.com).

@mergify mergify bot added the backport label Oct 27, 2025
@mergify mergify bot requested a review from a team as a code owner October 27, 2025 19:10
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 27, 2025
@mergify mergify bot requested review from michalpristas and swiatekm and removed request for a team October 27, 2025 19:10
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 27, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 27, 2025

Cherry-pick of 89c9b27 has failed:

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

You are currently cherry-picking commit 89c9b279d.
  (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:   testing/integration/ess/beat_receivers_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/ess/otel_test.go

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 backport label Oct 27, 2025
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team flaky-test Unstable or unreliable test cases. skip-changelog labels Oct 27, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@swiatekm swiatekm enabled auto-merge (squash) October 27, 2025 19:24
(cherry picked from commit 89c9b27)

# Conflicts:
#	testing/integration/ess/otel_test.go
@swiatekm swiatekm force-pushed the mergify/bp/9.1/pr-10851 branch from 0d84bd1 to d81d8af Compare October 28, 2025 18:29
@swiatekm swiatekm merged commit c4ca29e into 9.1 Oct 28, 2025
21 checks passed
@swiatekm swiatekm deleted the mergify/bp/9.1/pr-10851 branch October 28, 2025 20:13
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @swiatekm

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

Labels

backport conflicts There is a conflict in the backported pull request flaky-test Unstable or unreliable test cases. skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants