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 #39007) Buildkite Xpack/Winlogbeat pipeline fixes #39101

Merged
merged 3 commits into from
Apr 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2024

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3072 - updated Xpack/Winlogbeat pipeline module test step to use changeset calculation
BK Builds: https://buildkite.com/elastic/beats-xpack-winlogbeat/builds?branch=elastic%3Amergify%2Fbp%2F7.17%2Fpr-39007

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 #39007 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner April 22, 2024 08:53
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 22, 2024
Copy link
Contributor Author

mergify bot commented Apr 22, 2024

Cherry-pick of 243f9c3 has failed:

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

You are currently cherry-picking commit 243f9c33d8.
  (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:   .buildkite/scripts/changesets.psm1

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/scripts/common.sh
	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 Apr 22, 2024
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 22, 2024

💚 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: 2024-04-22T14:07:47.943+0000

  • Duration: 13 min 39 sec

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

Copy link
Contributor Author

mergify bot commented Apr 22, 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-39007 upstream/mergify/bp/7.17/pr-39007
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-39007

@oakrizan oakrizan force-pushed the mergify/bp/7.17/pr-39007 branch from 2a9330a to 3bdd0a6 Compare April 22, 2024 11:49
@oakrizan oakrizan added Team:Elastic-Agent Label for the Agent team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Apr 22, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

Copy link
Contributor Author

mergify bot commented Apr 22, 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-39007 upstream/mergify/bp/7.17/pr-39007
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-39007

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

oakrizan and others added 3 commits April 22, 2024 17:07
* updated common.sh

* fixed typo

* updated common.sh

* added changeset ps1 script and updated xpack-winlogbeat pipeline

* pr fixes

* handle backslashes in changeset directories

(cherry picked from commit 243f9c3)
@oakrizan oakrizan force-pushed the mergify/bp/7.17/pr-39007 branch from ffad308 to 0bf46d8 Compare April 22, 2024 14:07
@oakrizan oakrizan requested review from dliappis, pazone and a team April 22, 2024 14:07
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

@oakrizan oakrizan merged commit 1614b93 into 7.17 Apr 22, 2024
120 of 128 checks passed
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-39007 branch April 22, 2024 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants