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 #39513) Fixed pipelines formatting #39515

Merged
merged 5 commits into from
May 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2024

Proposed commit message

Fixed pipelines formatting

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


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

(cherry picked from commit 5bff7ec)

# Conflicts:
#	.buildkite/packetbeat/pipeline.packetbeat.yml
#	.buildkite/winlogbeat/pipeline.winlogbeat.yml
#	.buildkite/x-pack/pipeline.xpack.heartbeat.yml
#	.buildkite/x-pack/pipeline.xpack.libbeat.yml
#	.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
#	.buildkite/x-pack/pipeline.xpack.packetbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@mergify mergify bot requested a review from a team as a code owner May 10, 2024 16:29
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 10, 2024
@mergify mergify bot assigned pazone May 10, 2024
Copy link
Contributor Author

mergify bot commented May 10, 2024

Cherry-pick of 5bff7ec has failed:

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

You are currently cherry-picking commit 5bff7ec4ed.
  (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:   .buildkite/auditbeat/auditbeat-pipeline.yml
	modified:   .buildkite/filebeat/filebeat-pipeline.yml
	modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	modified:   .buildkite/libbeat/pipeline.libbeat.yml
	modified:   .buildkite/metricbeat/pipeline.yml
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/packetbeat/pipeline.packetbeat.yml
	both modified:   .buildkite/winlogbeat/pipeline.winlogbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.libbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.osquerybeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml

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 May 10, 2024
@botelastic
Copy link

botelastic bot commented May 10, 2024

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

Copy link
Contributor Author

mergify bot commented May 13, 2024

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

Copy link
Contributor Author

mergify bot commented May 15, 2024

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/7.17/pr-39513 upstream/mergify/bp/7.17/pr-39513
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-39513

@pazone pazone enabled auto-merge (squash) May 16, 2024 14:39
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pazone pazone merged commit 5d1fe6b into 7.17 May 16, 2024
99 checks passed
@pazone pazone deleted the mergify/bp/7.17/pr-39513 branch May 16, 2024 16:00
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.

2 participants