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

contrib: Explicitly set remote for backport branches #16804

Merged
merged 1 commit into from Jul 7, 2021
Merged

contrib: Explicitly set remote for backport branches #16804

merged 1 commit into from Jul 7, 2021

Conversation

twpayne
Copy link
Contributor

@twpayne twpayne commented Jul 6, 2021

Before this change, the backporting scripts would correctly push to the
user's remote, but the default remote for the backport branch was left
as origin (typically cilium/cilium).

This commit sets the backporting branch's remote to the user's remote,
so further pushes from the command line (e.g. after adding more commits
or rebasing) go by default to the correct remote.

Signed-off-by: Tom Payne tom@isovalent.com

Before this change, the backporting scripts would correctly push to the
user's remote, but the default remote for the backport branch was left
as origin (typically cilium/cilium).

This commit sets the backporting branch's remote to the user's remote,
so further pushes from the command line (e.g. after adding more commits
or rebasing) go by default to the correct remote.

Signed-off-by: Tom Payne <tom@isovalent.com>
@twpayne twpayne added the release-note/misc This PR makes changes that have no direct user impact. label Jul 6, 2021
@twpayne twpayne requested review from aanm and qmonnet July 6, 2021 12:05
@twpayne twpayne requested a review from a team as a code owner July 6, 2021 12:05
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.3 Jul 6, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.9 Jul 6, 2021
@twpayne
Copy link
Contributor Author

twpayne commented Jul 6, 2021

I've added the needs-backport labels as the contrib/backporting/submit-backport script is run from a backport branch. We could add the logic to contrib/backporting/start-backport instead, if preferred.

@twpayne
Copy link
Contributor Author

twpayne commented Jul 6, 2021

installation-and-connectivity test failure is likely cilium/cilium-cli#367.

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.11 Jul 6, 2021
@aanm aanm unassigned aanm Jul 6, 2021
@aanm aanm requested review from joestringer and removed request for aanm July 6, 2021 15:48
@twpayne
Copy link
Contributor Author

twpayne commented Jul 7, 2021

Marking this as ready-to-merge as its a trivial PR and the flake is unrelated to the PR.

@twpayne twpayne added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 7, 2021
@pchaigno pchaigno merged commit eea7f9c into cilium:master Jul 7, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.3 Jul 8, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.3 Jul 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.9 Jul 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.11 Jul 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Needs backport from master in 1.9.9 Jul 19, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Needs backport from master in 1.9.9 Jul 19, 2021
@joestringer joestringer added this to Needs backport from master in 1.9.10 Jul 19, 2021
@joestringer joestringer removed this from Needs backport from master in 1.9.9 Jul 19, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.11 Jul 22, 2021
@joestringer joestringer moved this from Needs backport from master to Backport done to v1.9 in 1.9.10 Sep 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.10.3
Backport done to v1.10
1.8.11
Backport done to v1.8
1.9.10
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

5 participants