[STORM-1490] Update storm-merge.py to be full featured

• Type: Improvement
• Status: In Progress
• Priority: Major
• Resolution: Unresolved
• Component/s: build
• Assignee: Unassigned
• Reporter: Robert Joseph Evans
• Created: 21/Jan/16 14:57
• Updated: 29/Apr/17 05:25

Description

storm-merge.py should optionally do more then just print out the merge command.

At a minimum it should

1. update the branch you are trying to merge to
2. create the branch integration branch (based off of the first branch)
3. run the merge
4. update the changelog (unless we just want this to go away)
5. run some sanity tests (minimum build, ideally some tests and RAT too)
6. merge the integration back to the main branch
7. push the result back to apache

It would also really be nice if it could offer the ability to cherry-pick a pull request made on another branch. Updating things as needed

If we want the changelog to go away it would not be too hard to combine a JIRA query with a git log to regenerate that too. But that might be a separate tool.