-
Notifications
You must be signed in to change notification settings - Fork 716
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
Update testinfra jobs to use 'main' base_ref #2590
Conversation
@@ -75,14 +75,14 @@ func ciLabelFor(ver string) string { | |||
|
|||
func branchFor(ver string) string { | |||
if ver == latestVersion { | |||
return "master" // TODO; this will update soon? | |||
return "main" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this would also end up applying main
to the k/k branches once the test-infra files are generated:
branchFor: takes a version like 1.20 and returns release-1.20 If the input is latest returns the master. Used for test-infra branch clones.
kubeadm/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-patches.yaml
Line 19 in 404ad24
base_ref: {{ branchFor .KubernetesVersion }} |
given currently this function is used only for k/k branches, we can leave the TODO here - i.e. wait for k/k to change to main.
https://github.com/kubernetes/kubeadm/search?p=2&q=branchFor
} | ||
return fmt.Sprintf("release-%s", ver) | ||
} | ||
|
||
func imageVer(ver string) string { | ||
if ver == latestVersion { | ||
return "master" // TODO; this will update soon? | ||
return "main" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
imageVer is used for test-infra's kubekins image versioning, so we can leave the TODO here as well:
https://github.com/kubernetes/kubeadm/search?p=1&q=imageVer
once test-infra moves to main we can update it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/hold
until we switch the branches here.
we are going to need the test-infra update PR ready to be merged as well before we make the switch.
d9b9281
to
936d48a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, i'm going to merge this and send the test-infra PR with the prow job updates.
/lgtm
/approve
/hold cancel |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123, SataQiu The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Ref: #2589