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

feat: add support for auto-backports #4990

Merged
merged 1 commit into from
Mar 25, 2021
Merged

Conversation

kuisathaverat
Copy link
Contributor

@kuisathaverat kuisathaverat commented Mar 24, 2021

What does this PR do?

Enable backports with mergify for:

  • 7.x branch with the label v7.13.0
  • 7.12 branch with the label v7.12.0

If any conflicts the PRs are created with the label conflict in addition a comment will be added with the actions to be done in order to fix the conflicts locally and push to the branch.

Why is it important?

Mergify provides different mechanism to interact with PRs and automate certain process.

Some examples

Backports to 7.x -> elastic/apm-pipeline-library#995
Merges to master -> elastic/apm-pipeline-library#994

Issues

Actions

  • Ask Infra to enable the mergify app in this project.
  • Agree with the team

@kuisathaverat kuisathaverat added feature automation Team:Automation Label for the Observability productivity team labels Mar 24, 2021
@kuisathaverat kuisathaverat requested review from a team March 24, 2021 14:35
@kuisathaverat kuisathaverat self-assigned this Mar 24, 2021
Copy link
Member

@v1v v1v left a comment

Choose a reason for hiding this comment

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

:)

@jalvz
Copy link
Contributor

jalvz commented Mar 24, 2021

I know that @axw approved of this, but for my understanding what is the reason for changing the backport tool? (afaik either can be automated)

@kuisathaverat
Copy link
Contributor Author

I know that @axw approved of this, but for my understanding what is the reason for changing the backport tool? (afaik either can be automated)

the tool used for local backport does not change, you can use whatever you want. To make the automated backport we proposed mergify over the GitHub action, for maintainability reasons, and features reasons (mergify offer more than auto-merge and auto-backport and all out of the box)
More context in these two issues:

@apmmachine
Copy link
Contributor

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #4990 opened

  • Start Time: 2021-03-24T14:35:20.528+0000

  • Duration: 42 min 45 sec

  • Commit: 92436c4

Test stats 🧪

Test Results
Failed 0
Passed 6262
Skipped 120
Total 6382

Trends 🧪

Image of Build Times

Image of Tests

Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

Thanks!

@axw
Copy link
Member

axw commented Mar 25, 2021

docs issue is unrelated, merging

@axw axw merged commit 8c7ccaf into elastic:master Mar 25, 2021
@jalvz
Copy link
Contributor

jalvz commented Mar 25, 2021

Thanks @kuisathaverat

@axw
Copy link
Member

axw commented Apr 30, 2021

@Mergifyio backport 7.x

@axw
Copy link
Member

axw commented Apr 30, 2021

@Mergifyio backport 7.13

axw pushed a commit to axw/apm-server that referenced this pull request Apr 30, 2021
axw pushed a commit to axw/apm-server that referenced this pull request Apr 30, 2021
axw added a commit that referenced this pull request Apr 30, 2021
Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com>
axw added a commit that referenced this pull request Apr 30, 2021
Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation feature Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automate backporting of PRs to active branches
6 participants