Skip to content

Add keep-backport-label in cherry_pick script#15680

Merged
ChrsMark merged 3 commits intoelastic:masterfrom
ChrsMark:optional_remove_backport_label
Jan 23, 2020
Merged

Add keep-backport-label in cherry_pick script#15680
ChrsMark merged 3 commits intoelastic:masterfrom
ChrsMark:optional_remove_backport_label

Conversation

@ChrsMark
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark commented Jan 20, 2020

What does this PR do?

This PR adds a keep-backport-label in cherry_pick script. If this flag is set then the label needs_backport of the original PR will be preserved.

Why is it important?

In many cases we want to backport to more than one branches so removing the label by default for any backporting action may remove label even if the backports are not completed yet.

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 tested this manually with #15535 and it works.

@jsoriano @kvch what do you think about this?

Signed-off-by: chrismark <chrismarkou92@gmail.com>
@kvch
Copy link
Copy Markdown
Contributor

kvch commented Jan 21, 2020

I like the idea of letting users decide if the label should be removed or not. However, it would be better if the default behaviour would not change. Meaning the label would be removed by default, unless e.g. --keep-backport-label is passed. Also, do you mind using - instead of _ in the flag name?

Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark ChrsMark requested a review from kvch January 22, 2020 09:39
@kvch
Copy link
Copy Markdown
Contributor

kvch commented Jan 22, 2020

One more thing: please update the PR description with the changes.

@ChrsMark ChrsMark changed the title Make needs_backport label removal optional when backporting PRs Add keep-backport-label in cherry_pick script Jan 23, 2020
@ChrsMark ChrsMark merged commit 9bdbf91 into elastic:master Jan 23, 2020
ChrsMark added a commit to ChrsMark/beats that referenced this pull request Jan 23, 2020
ChrsMark added a commit that referenced this pull request Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants