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 #39261) Update filebeat pipeline to match Jenkins steps #39507

Merged
merged 12 commits into from
May 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2024

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3254 - updated filebeat pipeline to match same steps & commands as in Jenkins.
Jenkins vs. Buildkite comparison: https://gist.github.com/oakrizan/c45f1554b3f7ffbe153e244a248ce07d
BK builds: https://buildkite.com/elastic/filebeat/builds?branch=elastic%3Amergify%2Fbp%2F7.17%2Fpr-39261

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


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

* updated filebeat pipeline

* updated pre-command

* updated timeout for python tests

* restored original timeout

* pr fixes

(cherry picked from commit a878b49)
@mergify mergify bot requested a review from a team as a code owner May 10, 2024 09:49
@mergify mergify bot added the backport label May 10, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2024
@oakrizan oakrizan added :Windows macOS Enable builds in the CI for darwin testing arm Enable builds in the CI for ARM testing labels May 10, 2024
@oakrizan
Copy link
Contributor

/test

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 @oakrizan? 🙏

.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
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-39261 upstream/mergify/bp/7.17/pr-39261
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-39261

@oakrizan oakrizan requested a review from dliappis May 15, 2024 14:35
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

left two minor suggestions that don't warrant another review cycle

.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
@oakrizan oakrizan merged commit 4931474 into 7.17 May 16, 2024
152 checks passed
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-39261 branch May 16, 2024 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
arm Enable builds in the CI for ARM testing backport macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd :Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants