ceph-backport.sh: implement interactive setup routine and new options#31366
Merged
smithfarm merged 3 commits intoceph:masterfrom Nov 5, 2019
Merged
ceph-backport.sh: implement interactive setup routine and new options#31366smithfarm merged 3 commits intoceph:masterfrom
smithfarm merged 3 commits intoceph:masterfrom
Conversation
Contributor
|
I added #31367 using these edits. One comment: Iiuc |
a1d3619 to
ac2db93
Compare
This commit implements several new features:
* a --cherry-pick-only option
* a --force option
* an --existing-pr option
* an interactive setup routine
The --cherry-pick-only option can be used to test whether a backport
cherry-picks cleanly, for example. This is the same as the --prepare
functionality that was provided by an earlier version of the script, and
--prepare is re-introduced as a synonym for --cherry-pick-only.
The --force option can be used to make the script less careful (less
"cowardly"). For example, if the script refuses to do a backport because the
backport tracker issue is assigned to someone else, the script will "cowardly"
refuse to continue. Use --force to override. Be aware that --force will also
blow away an existing wip branch - the script asks for user confirmation in this
case.
The new --existing-pr option can be used to specify the number (ID) of an
existing backport PR that addresses the backport tracker issue given via the
positional argument.
The new "interactive setup routine" should make the setup process much simpler
for the user. If there is a setup issue, the script produces a report and starts
the interactive setup routine, which prompts the user for the needed
information.
Also, the script no longer requires the user to explicitly provide values for
github_user and redmine_user_id. Instead, it divines the correct values from the
GitHub token and the Redmine key, respectively.
Finally, the existing ~/bin/backport_common.sh file is deprecated in favor of
two files:
~/.github_token
~/.redmine_key
(The latter is already used by Sage's build-integration-branch tool and it
didn't make sense to have two different configuration files for a single
purpose.)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit implements several new features:
--cherry-pick-onlyoption--forceoption--existing-proptionThe
--cherry-pick-onlyoption can be used to test whether a backport cherry-picks cleanly, for example. This is the same as the--preparefunctionality that was provided by an earlier version of the script, and--prepareis re-introduced as a synonym for--cherry-pick-only.The
--forceoption can be used to make the script less careful (less "cowardly"). For example, if the script refuses to do a backport because the backport tracker issue is assigned to someone else, the script will "cowardly" refuse to continue. Use--forceto override. Be aware that--forcewill also blow away an existing wip branch - the script asks for user confirmation in this case.The new
--existing-proption can be used to specify the number (ID) of an existing backport PR that addresses the backport tracker issue given via the positional argument.The new "interactive setup routine" should make the setup process much simpler for the user. If there is a setup issue, the script produces a report and starts the interactive setup routine, which prompts the user for the needed information.
Also, the script no longer requires the user to explicitly provide values for
github_userandredmine_user_id. Instead, it divines the correct values from the GitHub token and the Redmine key, respectively.Finally, the existing ~/bin/backport_common.sh file is deprecated in favor of two files:
(The latter is already used by Sage's build-integration-branch tool and it didn't make sense to have two different configuration files for a single purpose.)
Signed-off-by: Nathan Cutler ncutler@suse.com