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 #38964) migrate x-pack/libbeat to static #39082

Merged
merged 9 commits into from
Apr 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 19, 2024

What is the problem this PR solves?

Jenkins->Buildkite pipelines migration

Migrate x-pack/libbeat from dynamic to static pipeline

Examples of the pipelines:
https://buildkite.com/elastic/beats/builds/5828
https://buildkite.com/elastic/beats-xpack-libbeat/builds/2673

Related issues

https://github.com/elastic/ingest-dev/issues/1693


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

* migrate x-pack/libbeat to static

* Update pull-requests.json

* change paths

* Update pull-requests.json

* change conditions for group-steps

* change the pipeline.yml

* work with remarks

* work with remarks

* remove libbeat and x-pack/libbeat changesets from the common.sh

* remove libbeat and x-pack/libbeat changesets from the common.sh

* fix merge issues

* Update .buildkite/x-pack/pipeline.xpack.libbeat.yml

Co-authored-by: Dimitrios Liappis <[email protected]>

* apply common.sh from main and cleanup it

* change paths

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit b0690b5)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/pull-requests.json
#	.buildkite/scripts/common.sh
#	.buildkite/x-pack/pipeline.xpack.libbeat.yml
@mergify mergify bot requested a review from a team as a code owner April 19, 2024 15:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 19, 2024
Copy link
Contributor Author

mergify bot commented Apr 19, 2024

Cherry-pick of b0690b5 has failed:

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

You are currently cherry-picking commit b0690b5fb9.
  (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/hooks/pre-command
	deleted:    .buildkite/scripts/generate_xpack_libbeat_pipeline.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/pipeline.yml
	both modified:   .buildkite/pull-requests.json
	both modified:   .buildkite/scripts/common.sh
	both modified:   .buildkite/x-pack/pipeline.xpack.libbeat.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 19, 2024
@botelastic
Copy link

botelastic bot commented Apr 19, 2024

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 19, 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

  • Duration: 12 min 27 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@sharbuz sharbuz added the arm Enable builds in the CI for ARM testing label Apr 19, 2024
@sharbuz sharbuz requested review from dliappis and alexsapran April 19, 2024 15:27
@sharbuz sharbuz added macOS Enable builds in the CI for darwin testing and removed macOS Enable builds in the CI for darwin testing labels Apr 19, 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.

Windows tests seems to be failing (e.g. https://buildkite.com/elastic/beats-xpack-libbeat/builds/2839#018ef71a-0841-47e8-bae1-faee2bb95956) but the good news is that I think we don't need them at all?

Copy link
Contributor Author

mergify bot commented Apr 22, 2024

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

@sharbuz sharbuz requested a review from dliappis April 22, 2024 06:57
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.

Basically LGTM.

One final ask, could we remove the reference to xpack-libbeat in the win_unit_tests.ps1 script in the 7.17 branch, now that we've noticed that we don't need Windows tests for this project and branch?

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

@dliappis dliappis self-requested a review April 22, 2024 10:58
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

@sharbuz sharbuz merged commit 9b27c91 into 7.17 Apr 22, 2024
92 of 96 checks passed
@sharbuz sharbuz deleted the mergify/bp/7.17/pr-38964 branch April 22, 2024 11:14
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 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.

3 participants