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 #38783) Single pipeline entrypoint #38793

Merged
merged 3 commits into from
Apr 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 9, 2024

Proposed commit message

A single pipeline entry point that triggers other pipelines according to the changeset.
The Main pipeline triggers corresponding pipelines: Auditbeat and Heartbeat.

the statuses are reported back to GH (Simply auditbeat and heartbeat) :
Screenshot 2024-04-09 at 14 29 24

Labels and other critical env vars are passed to the trigger step

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

* Single pipeline entrypoint

* Fix indentations

* Notifications

(cherry picked from commit d0a3b45)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
@mergify mergify bot added the backport label Apr 9, 2024
@mergify mergify bot requested a review from a team as a code owner April 9, 2024 19:45
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 9, 2024
@mergify mergify bot requested review from faec and leehinman and removed request for a team April 9, 2024 19:45
@mergify mergify bot assigned pazone Apr 9, 2024
Copy link
Contributor Author

mergify bot commented Apr 9, 2024

Cherry-pick of d0a3b45 has failed:

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

You are currently cherry-picking commit d0a3b457ec.
  (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
	modified:   .buildkite/pull-requests.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	both modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	both modified:   .buildkite/pipeline.yml
	both modified:   .buildkite/scripts/common.sh

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

botelastic bot commented Apr 9, 2024

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 9, 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: 13 min 10 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!)

Copy link
Collaborator

@pierrehilbert pierrehilbert left a comment

Choose a reason for hiding this comment

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

You need to fix the conflict

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.

@pazone
Copy link
Contributor

pazone commented Apr 10, 2024

Resolved

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
Copy link
Contributor

pazone commented Apr 10, 2024

@pierrehilbert It's resolved

@pazone pazone merged commit 93293bb into 7.17 Apr 10, 2024
12 checks passed
@pazone pazone deleted the mergify/bp/7.17/pr-38783 branch April 10, 2024 13:00
michel-laterman pushed a commit to michel-laterman/beats that referenced this pull request Apr 17, 2024
)

* Single pipeline entrypoint (elastic#38783)

* Single pipeline entrypoint

* Fix indentations

* Notifications

(cherry picked from commit d0a3b45)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh

* Resolved conflicts

---------

Co-authored-by: Pavel Zorin <[email protected]>
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.

4 participants