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

Update testinfra jobs to use 'main' base_ref #2590

Merged
merged 1 commit into from
Oct 26, 2021

Conversation

SataQiu
Copy link
Member

@SataQiu SataQiu commented Oct 18, 2021

Ref: #2589

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 18, 2021
@k8s-ci-robot k8s-ci-robot added sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 18, 2021
@@ -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"
Copy link
Member

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:

https://github.com/kubernetes/kubeadm/blob/29ce58d26958040e5b106e2012d4db2c76366a35/kinder/ci/tools/update-workflows/README.md#functions

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.

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"
Copy link
Member

@neolit123 neolit123 Oct 18, 2021

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.

Copy link
Member

@neolit123 neolit123 left a 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.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 18, 2021
Copy link
Member

@neolit123 neolit123 left a 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

@neolit123
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 26, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 26, 2021
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 46772ff into kubernetes:master Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants