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

[pre-commit] for linting merge-conflict, pipelines and JJBB #28501

Merged
merged 2 commits into from
Oct 19, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Oct 18, 2021

What does this PR do?

Enable check for merge-conflicts, JJBB syntax validation and Pipelines in the CI
It runs in parallel

Why is it important?

Ensure we detect breaking changes before merging.

Mergify creates automated backports but some of those backports contain conflicts, those conflicts are tagged with the label conflict.

Unfortunately the CI does not evaluate if those changes contain any merge conflicts, so pre-commit will be the way to detect those issues

To ensure PRs with conflicts are failing in the CI.

@v1v v1v requested a review from a team as a code owner October 18, 2021 13:58
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 18, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 18, 2021

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 18, 2021
@v1v v1v added automation backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify needs_team Indicates that the issue/PR needs a Team:* label and removed backport-skip Skip notification from the automated backport with mergify labels Oct 18, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 18, 2021
@v1v v1v self-assigned this Oct 18, 2021
@botelastic
Copy link

botelastic bot commented Oct 18, 2021

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

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
- id: check-merge-conflict
Copy link
Member Author

Choose a reason for hiding this comment

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 18, 2021

💚 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: 2021-10-18T14:16:03.859+0000

  • Duration: 166 min 43 sec

  • Commit: d7796c7

Test stats 🧪

Test Results
Failed 0
Passed 53936
Skipped 5344
Total 59280

💚 Flaky test report

Tests succeeded.

🤖 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.

@v1v v1v merged commit 0a24250 into elastic:master Oct 19, 2021
mergify bot pushed a commit that referenced this pull request Oct 19, 2021
mergify bot pushed a commit that referenced this pull request Oct 19, 2021
v1v added a commit that referenced this pull request Oct 20, 2021
v1v added a commit that referenced this pull request Oct 20, 2021
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@v1v v1v added the backport-7.17 Automated backport to the 7.17 branch with mergify label Aug 22, 2022
mergify bot pushed a commit that referenced this pull request Aug 22, 2022
v1v added a commit that referenced this pull request Aug 23, 2022
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport-7.17 Automated backport to the 7.17 branch with mergify backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants