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.

Sign up for GitHub

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

Jump to bottom

Trigger the monorepo trigger only on PR #39176

Merged
merged 8 commits into from
Apr 24, 2024
Merged

Trigger the monorepo trigger only on PR #39176

merged 8 commits into from
Apr 24, 2024

Conversation

alexsapran
Copy link
Contributor

@alexsapran alexsapran commented Apr 24, 2024 •
edited
Loading

Proposed commit message

This PR adjusts the central pipeline to enable running the trigger steps for branches and PRs.

Example build with only triggering for Auditbeat to show that it worked https://buildkite.com/elastic/beats/builds/6353

Proper testing, unfortunately, with BK is done after we merge this.

Signed-off-by: Alexandros Sapranidis alexandros@elastic.co

@alexsapran
Trigger the monorepo trigger only on PR
c16dd24 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran
Add triggering for Auditbeat for branches
86e874a 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran alexsapran added ci backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify Team:Ingest-EngProd backport-v8.14.0 Automated backport with mergify labels Apr 24, 2024
@alexsapran alexsapran self-assigned this Apr 24, 2024
@alexsapran alexsapran requested a review from a team as a code owner April 24, 2024 09:47
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 24, 2024
@alexsapran
Testing auditbeat trigger
b58e5ce 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran
Fix trigger env vars:
43df543 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 24, 2024 •
edited
Loading

💚 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 17 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!)

@alexsapran
Revert "Testing auditbeat trigger"
5562893 
This reverts commit b58e5ce.
@alexsapran
Add triggers for the rest of the projects
66f1791 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran
Adjust step conditions
9702f28 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran
Remove env vars, running on branch doesnt have them
5d9c865 
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
dliappis
dliappis approved these changes Apr 24, 2024
View reviewed changes
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 a suggestion for an improvement

.buildkite/pipeline.yml
@@ -241,7 +306,15 @@ steps:
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}

- label: "Triggering Build for Xpack/Winlogbeat"
Copy link
Contributor

Choose a reason for hiding this comment

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

should we change the name a bit to help us understand that these aren't PR triggers? Something like:

Triggering merge commit Build for x-pack/winlogbeat ? It might be useful when users look at the BK run view to understand what was is being run?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good suggestion. TBH, I don't know; given that the UI in BK would already be filtered by the branch, being explicit about it in the label seems too much.
We could keep this as is and revisit the labels for all the steps in a follow-up. As part of this work, I noticed other inconsistencies that I chose to avoid fixing here.

@alexsapran alexsapran merged commit 272b5c7 into elastic:main Apr 24, 2024
14 of 17 checks passed
mergify bot pushed a commit that referenced this pull request Apr 24, 2024
@alexsapran @mergify
Use monorepo plugin on PR and triggers for branches (#39176)
810124b 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)
mergify bot pushed a commit that referenced this pull request Apr 24, 2024
@alexsapran @mergify
Use monorepo plugin on PR and triggers for branches (#39176)
78a9a7e 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)
mergify bot pushed a commit that referenced this pull request Apr 24, 2024
@alexsapran @mergify
Use monorepo plugin on PR and triggers for branches (#39176)
162de99 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)
This was referenced Apr 24, 2024
Merged
Merged
Merged
alexsapran added a commit that referenced this pull request Apr 25, 2024
@mergify @alexsapran
[7.17](backport #39176) Trigger the monorepo trigger only on PR (#39189)
ba360d8 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
alexsapran added a commit that referenced this pull request Apr 25, 2024
@mergify @alexsapran
[8.13](backport #39176) Trigger the monorepo trigger only on PR (#39190)
39d7ad7 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
alexsapran added a commit that referenced this pull request Apr 25, 2024
@mergify @alexsapran
[8.14](backport #39176) Trigger the monorepo trigger only on PR (#39191)
7579789 
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.

(cherry picked from commit 272b5c7)

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dliappis dliappis dliappis approved these changes

Assignees

@alexsapran alexsapran

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci Team:Ingest-EngProd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alexsapran @elasticmachine @dliappis