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

[CI] automate update-beats (backport #5692) #7176

Merged
merged 5 commits into from
Feb 2, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2022

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

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

You are currently cherry-picking commit bd10c37b.
  (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:   .ci/update-beats.groovy
	modified:   .mergify.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .ci/scripts/update-beats.sh

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 bd10c37)

# Conflicts:
#	.ci/scripts/update-beats.sh
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 2, 2022
@mergify mergify bot mentioned this pull request Feb 2, 2022
@v1v v1v self-assigned this Feb 2, 2022
.ci/scripts/update-beats.sh Outdated Show resolved Hide resolved
@v1v v1v added automation and removed conflicts There is a conflict in the backported pull request labels Feb 2, 2022
@v1v v1v requested a review from axw February 2, 2022 10:43
@v1v
Copy link
Member

v1v commented Feb 2, 2022

@apmmachine
Copy link
Contributor

apmmachine commented Feb 2, 2022

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

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

.ci/update-beats.groovy Outdated Show resolved Hide resolved
.ci/update-beats.groovy Outdated Show resolved Hide resolved
@v1v v1v requested a review from simitt February 2, 2022 13:45
.ci/update-beats.groovy Outdated Show resolved Hide resolved
@v1v v1v merged commit 316b1cc into 7.17 Feb 2, 2022
@v1v v1v deleted the mergify/bp/7.17/pr-5692 branch February 2, 2022 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants