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.

Sign up for GitHub

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

Jump to bottom

Create automatic release branch fast forward job #2386

Closed
7 tasks done
saschagrunert opened this issue Jan 13, 2022 · 7 comments · Fixed by #2389 or #2390
Closed
7 tasks done

Create automatic release branch fast forward job #2386

saschagrunert opened this issue Jan 13, 2022 · 7 comments · Fixed by #2389 or #2390
Assignees
@saschagrunert
Labels
area/release-eng Issues or PRs related to the Release Engineering subproject kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/release Categorizes an issue or PR as relevant to SIG Release.
Milestone
v1.25

Comments

@saschagrunert
Copy link
Member

saschagrunert commented Jan 13, 2022 •
edited
Loading

As discussed in kubernetes/sig-release#1794, there is a gap between the content of the k/k release-* branch and master when we cut the RC on test freeze, because:

  • PRs in the milestone may not have been merged yet into the master, because they're in the prow test queue
  • PRs get the latest milestone applied after the RC creation

To streamline the process of the latest release branch, I now propose to automate the branch fast forward until we cut the final release. This has to be communicated and documented clearly to all contributors before the automation goes live. That said, we have to:

For now everything should run in mock mode, meaning that no modifications to the main repository will be done until we have communicated the change accordingly.

Testgrid: https://testgrid.k8s.io/sig-release-releng-blocking#git-repo-kubernetes-fast-forward
@saschagrunert saschagrunert added kind/feature Categorizes issue or PR as related to a new feature. sig/release Categorizes an issue or PR as relevant to SIG Release. area/release-eng Issues or PRs related to the Release Engineering subproject labels Jan 13, 2022
@saschagrunert saschagrunert added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority labels Jan 13, 2022
@saschagrunert saschagrunert self-assigned this Jan 13, 2022
@saschagrunert
Copy link
Member Author

cc @kubernetes/sig-architecture @kubernetes/sig-testing

@cpanato
Copy link
Member

cpanato commented Jan 13, 2022

i like this approach and i think that will be good for us

@puerco
Copy link
Member

puerco commented Jan 13, 2022 •
edited
Loading

+1 I think this is the best scenario.

From our side, I preferred the idea of reopening master instantly after branch creation, but @liggitt made an excellent point here against reopening immediatly.

Cherry picks have been chaotic, especially the last two releases. Although we did a poor job communicating the change back in 1.19, I feel they are an unnecessary burden on humans and I think efforts should go into a better system to apply the milestones more carefully while the branch is frozen.

saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
b685719 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert saschagrunert mentioned this issue Jan 14, 2022
Merged
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
4534a60 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
13c7525 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
beb3b46 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
2655308 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
a106c55 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release that referenced this issue Jan 14, 2022
@saschagrunert
Add fastforward unit tests
00765d9 
Adding unit tests before changing the logic.

Refers to kubernetes#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/release-sdk that referenced this issue Jan 14, 2022
@saschagrunert
Add LatestReleaseBranch() and RemoteBranches() git API
9f0d09c 
We now add two API methods to the `git` package, which will be used for
the automatic fast forward of release branches.

Refers to kubernetes/release#2386

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
This was referenced Jan 14, 2022
Merged
Merged
@saschagrunert saschagrunert added this to the v1.24 milestone Jan 14, 2022
This was linked to pull requests Jan 14, 2022
Add fastforward package unit tests #2389
Merged
Support automatic krel fast forward #2390
Merged
@saschagrunert saschagrunert reopened this Jan 14, 2022
@saschagrunert saschagrunert reopened this Jan 14, 2022
@saschagrunert saschagrunert mentioned this issue Jan 17, 2022
Merged
@saschagrunert
Copy link
Member Author

Only the integration into prow is missing now, see kubernetes/test-infra#24901

ameukam added a commit to ameukam/test-infra that referenced this issue Feb 7, 2022
@ameukam
sig-release: fix location for ci-fast-forward
97aa0e6 
Related:
 - kubernetes/release#2386

Followup of:
 - kubernetes#24901

The test `TestK8sInfraTrusted` only allow postsubmits and periodics
running on `k8s-infra-prow-build-trusted` cluster to be located in path
`kubernetes/sig-k8s-infra/trusted`.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
@ameukam ameukam mentioned this issue Feb 7, 2022
Merged
ameukam added a commit to ameukam/test-infra that referenced this issue Feb 7, 2022
@ameukam
sig-release: fix location for ci-fast-forward
bd13486 
Related:
 - kubernetes/release#2386

Followup of:
 - kubernetes#24901

The test `TestK8sInfraTrusted` only allow postsubmits and periodics
running on `k8s-infra-prow-build-trusted` cluster to be located in path
`kubernetes/sig-k8s-infra/trusted`.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
ameukam added a commit to ameukam/k8s.io that referenced this issue Feb 9, 2022
@ameukam
releng: Fix project for automated git fast-forward
b93b032 
Related:
  - kubernetes/release#2386

Followup of:
  - kubernetes#3372

Fix the project used to get the Github token for git auto fast-forward
for kubernetes/kubernetes repo.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
@ameukam ameukam mentioned this issue Feb 9, 2022
Merged
@saschagrunert saschagrunert mentioned this issue Feb 10, 2022
Merged
@saschagrunert
Copy link
Member Author

Testgrid is green now: https://testgrid.k8s.io/sig-release-releng-informing#git-repo-kubernetes-fast-forward

@saschagrunert
Copy link
Member Author

Update email sent to k-dev: https://groups.google.com/a/kubernetes.io/g/dev/c/qbHPJjUF3s8/m/f_6NI4-TBAAJ

This was referenced Feb 16, 2022
Closed
Merged
@saschagrunert saschagrunert mentioned this issue Mar 7, 2022
Merged
@saschagrunert saschagrunert mentioned this issue Apr 4, 2022
Merged
@saschagrunert saschagrunert modified the milestones: v1.24, v1.25 Apr 4, 2022
@saschagrunert saschagrunert mentioned this issue Apr 20, 2022
Merged
This was referenced May 4, 2022
Merged
Merged
Merged
Merged
@saschagrunert
Copy link
Member Author

Sent a note to k-dev: https://groups.google.com/a/kubernetes.io/g/dev/c/qbHPJjUF3s8/m/6tjttkfHAAAJ

Everything works so far, we can consider this one as finished. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@saschagrunert saschagrunert

Labels
area/release-eng Issues or PRs related to the Release Engineering subproject kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/release Categorizes an issue or PR as relevant to SIG Release.
Projects
None yet
Milestone
v1.25
4 participants
@saschagrunert @puerco @cpanato @k8s-ci-robot