Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #43254) Skip flaky vsphere datastore TestFetchEventContents #43261

Merged
merged 4 commits into from
Mar 18, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2025

Skip flaky test from #43252


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

(cherry picked from commit cd2ff13)

# Conflicts:
#	metricbeat/module/vsphere/datastore/datastore_test.go
@mergify mergify bot requested a review from a team as a code owner March 13, 2025 07:56
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 13, 2025
@mergify mergify bot assigned faec Mar 13, 2025
Copy link
Contributor Author

mergify bot commented Mar 13, 2025

Cherry-pick of cd2ff13 has failed:

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

You are currently cherry-picking commit cd2ff1333.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/vsphere/datastore/datastore_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 13, 2025
@botelastic
Copy link

botelastic bot commented Mar 13, 2025

This pull request doesn't have a Team:<team> label.

Copy link
Contributor Author

mergify bot commented Mar 17, 2025

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

@faec faec merged commit 8bc7d8a into 7.17 Mar 18, 2025
27 checks passed
@faec faec deleted the mergify/bp/7.17/pr-43254 branch March 18, 2025 14:46
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant