-
Notifications
You must be signed in to change notification settings - Fork 500
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
Create automatic release branch fast forward job #2386
Comments
cc @kubernetes/sig-architecture @kubernetes/sig-testing |
i like this approach and i think that will be good for us |
+1 I think this is the best scenario. From our side, I preferred the idea of reopening 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. |
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Adding unit tests before changing the logic. Refers to kubernetes#2386 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
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>
Only the integration into prow is missing now, see kubernetes/test-infra#24901 |
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>
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>
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>
Testgrid is green now: https://testgrid.k8s.io/sig-release-releng-informing#git-repo-kubernetes-fast-forward |
Update email sent to k-dev: https://groups.google.com/a/kubernetes.io/g/dev/c/qbHPJjUF3s8/m/f_6NI4-TBAAJ |
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. :) |
As discussed in kubernetes/sig-release#1794, there is a gap between the content of the k/k
release-*
branch andmaster
when we cut the RC on test freeze, because:master
, because they're in the prow test queueTo 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:
krel ff
to automatically determine if a fast forward is required (latest release branch has no final tag):Add
fastforward
package unit tests #2389Support automatic krel fast forward #2390
Add
LatestReleaseBranch()
andRemoteBranches()
git API kubernetes-sigs/release-sdk#18Clone tool repo on krel fast-forward #2413
krel/ff: add an option to define a gcp project to use instead of the default one #2414
Fix krel fast-forward log bucket #2424
Add support for running krel fast-forward in GCB #2391
Add SIG Release k/k fast-forward job test-infra#24901
sig-release: fix location for ci-fast-forward test-infra#25140
Grant
k8s-staging-releng-test
GCB service account KMS CryptoKey Decrypter k8s.io#3372Describe auto fast-forward in release phases sig-release#1855
Add hint about test freeze for prow bot approve comment test-infra#25300
Add testfreeze plugin test-infra#25535
Enable
testfreeze
plugin for k/k test-infra#25644Enable auto fast-forward job in nomock mode test-infra#26188
Mention new testfreeze auto fast forward sig-release#1898
Make testfreeze plugin work with auto fast-forward test-infra#26190
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
The text was updated successfully, but these errors were encountered: