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

[8.4](backport #32745) action: checks for auditbeat and x-pack/auditbeat #32813

Merged
merged 3 commits into from
Aug 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2022

This is an automatic backport of pull request #32745 done by Mergify.
Cherry-pick of beff80f has failed:

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

You are currently cherry-picking commit beff80f2af.
  (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:
	new file:   .github/workflows/check-audtibeat.yml
	new file:   .github/workflows/check-xpack-auditbeat.yml
	modified:   auditbeat/Jenkinsfile.yml
	modified:   x-pack/auditbeat/Jenkinsfile.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/opentelemetry.yml

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit beff80f)

# Conflicts:
#	.github/workflows/opentelemetry.yml
@mergify mergify bot requested review from a team as code owners August 24, 2022 15:34
@mergify mergify bot requested review from belimawr and rdner and removed request for a team August 24, 2022 15:34
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 24, 2022
@mergify mergify bot assigned v1v Aug 24, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 24, 2022
@botelastic
Copy link

botelastic bot commented Aug 24, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 24, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-08-25T08:48:24.098+0000

  • Duration: 50 min 10 sec

Test stats 🧪

Test Results
Failed 0
Passed 570
Skipped 81
Total 651

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.4/pr-32745 upstream/mergify/bp/8.4/pr-32745
git merge upstream/8.4
git push upstream mergify/bp/8.4/pr-32745

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Aug 25, 2022
@v1v v1v merged commit 4a07748 into 8.4 Aug 25, 2022
@mergify mergify bot deleted the mergify/bp/8.4/pr-32745 branch August 25, 2022 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants