PR-v1.7-backport-2021-02-19 #15040
Merged
PR-v1.7-backport-2021-02-19 #15040
Conversation
This file contains 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
[ upstream commit c7e2573 ] Previously, the script assumed `origin` would point to the upstream branch. For users with forked repositories this is not necessarily true, therefore this commit auto-detects the remote name based on the git remote url. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit bbf5b20 ] This commit adds a optional positional argument to `get_remote` to allow obtaining the remote of Cilium forks in other organizations than the default `cilium` one. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit 0195657 ] This adds support for pushing backport PRs from Cilium forks. Because the names of remotes in forked repositories are not standardized, the `submit-backport` script is changed such that it accepts two branch arguments: The upstream remote and the user (fork) remote. The upstream remote is detected using the existing `get_remote` helper, while the user (fork) remote is guessed by checking for a remote matching `github.com/<user>/cilium`. Co-authored-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit 388e7aa ] Co-authored-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
nathanjsweet
added
kind/backports
jibi
approved these changes
Feb 22, 2021
gandro
reviewed
Feb 22, 2021
| @@ -18,6 +18,14 @@ DIR=$(dirname $(readlink -ne $BASH_SOURCE)) | |||
| source $DIR/../release/lib/common.sh | |||
| source $DIR/common.sh | |||
|
|
|||
| require_linux | |||
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.
v1.7 backports 2021-02-19
Once this PR is merged, you can update the PR labels via: