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 #39211) Update xpack/filebeat & xpack/metricbeat pipelines to match Jenkins steps #39608

Merged
merged 8 commits into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

Proposed commit message

Updated x-pack/filebeat and x-pack/metricbeat pipelines to match same steps & commands as in Jenkins.

Jenkins vs. Buildkite comparison

For both pipelines updated cloud test environment setup script and test commands to match Jenkins.

x-pack/filebeat: Cloud (MODULE) Tests failure is not related to current PR changes.

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

  • .buildkite/x-pack/pipeline.xpack.filebeat.yml
  • .buildkite/x-pack/pipeline.xpack.metricbeat.yml

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

BK builds:
x-pack/filebeat: https://buildkite.com/elastic/beats-xpack-filebeat/builds?branch=elastic%3Amergify%2Fbp%2F7.17%2Fpr-39211
x-pack/metricbeat: https://buildkite.com/elastic/beats-xpack-metricbeat/builds?branch=elastic%3Amergify%2Fbp%2F7.17%2Fpr-39211


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

…teps (#39211)

Updated x-pack/filebeat and x-pack/metricbeat pipelines to match same steps & commands as in Jenkins

(cherry picked from commit bf13818)

# Conflicts:
#	.buildkite/x-pack/pipeline.xpack.filebeat.yml
#	.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@mergify mergify bot requested a review from a team as a code owner May 17, 2024 07:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 17, 2024
Copy link
Contributor Author

mergify bot commented May 17, 2024

Cherry-pick of bf13818 has failed:

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

You are currently cherry-picking commit bf138189db.
  (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:
	renamed:    .buildkite/scripts/cloud_tests.sh -> .buildkite/scripts/setup_cloud_env.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.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 17, 2024
Copy link
Contributor Author

mergify bot commented May 17, 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-39211 upstream/mergify/bp/7.17/pr-39211
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-39211

@oakrizan oakrizan added :Windows macOS Enable builds in the CI for darwin testing arm Enable builds in the CI for ARM testing aws Enable builds in the CI for aws cloud testing and removed conflicts There is a conflict in the backported pull request labels May 17, 2024
@oakrizan
Copy link
Contributor

/test

@oakrizan oakrizan removed the aws Enable builds in the CI for aws cloud testing label May 17, 2024
@oakrizan
Copy link
Contributor

/test

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 17, 2024
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

@dliappis dliappis self-requested a review May 17, 2024 13:43
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 with the latest changes too

@oakrizan oakrizan merged commit 3e3a5cb into 7.17 May 17, 2024
149 checks passed
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-39211 branch May 17, 2024 16:39
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