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

[mergify] auto-merge with a new condition to apply if approved > 0 #28435

Merged
merged 1 commit into from
Oct 14, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Oct 14, 2021

What does this PR do?

Fix a corner case and add the condition that the mergify rule is only evaluated if the automated PRs have been approved. The approval can happen automatically (mergify provides a rule for such) or manually by someone else.

Why is it important?

This is only affecting the automated PRs created with the bump of a new ElasticStack snapshot version that happens once a day or when a new ElasticStack release is cut.

Even though in those cases, this issue will not happen always! Only when the build is green (builds in Beats don't always build correctly, since, flakiness in the tests, flakiness in the infrastructure, or third party system, or a PR got merged and broke something...)

What does it happen?

If the automated PR (only the one changing the ES snapshot version or the new release) passed, then it gets tried to be merged, but since there is not an approval (it's required to be approved at least for one person) then it gets merged with the target branch and a new build will happen. This is a sequential process and does not happen often and when it does the recurrence will be avoided since https://github.com/elastic/beats/blob/master/Jenkinsfile#L36

@v1v v1v added bug automation ci Team:Automation Label for the Observability productivity team backport-skip Skip notification from the automated backport with mergify labels Oct 14, 2021
@v1v v1v requested a review from a team October 14, 2021 11:42
@v1v v1v self-assigned this Oct 14, 2021
@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 Oct 14, 2021
@elasticmachine
Copy link
Collaborator

💚 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: 25 min 11 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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 ec50961 into elastic:master Oct 14, 2021
@v1v v1v deleted the fix/mergify-squash branch October 14, 2021 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport-skip Skip notification from the automated backport with mergify bug ci Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants