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

🌱 scripts: fix checking out k/k release branch #11836

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

CI currently builds kubernetes from master branch instead of release branches. This fixes the git checkout part.

The checkout done in clonerefs does only checkout tags and a git fetch --all does not bring in branches.

This adapts the way of fetching branches to how its done by clonerefs.

xref: https://kubernetes.slack.com/archives/C08AA0FFWG3/p1739449748554519?thread_ts=1738954219.172549&cid=C08AA0FFWG3

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/area ci

@k8s-ci-robot k8s-ci-robot added the area/ci Issues or PRs related to ci label Feb 13, 2025
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 13, 2025
@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-blocking-main
pull-cluster-api-test-main
pull-cluster-api-verify-main

In response to this:

/test help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 13, 2025
@chrischdi
Copy link
Member Author

/hold

Want to check if this worked via looking at logs.

/test pull-cluster-api-e2e-latestk8s-main

@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 Feb 13, 2025
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@chrischdi
Copy link
Member Author

/cherry-pick release-1.9

@chrischdi
Copy link
Member Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi chrischdi force-pushed the pr-fixup-git-checkout branch from cdf485b to ed85f0c Compare February 13, 2025 14:09
@chrischdi chrischdi changed the base branch from main to release-1.7 February 13, 2025 14:09
Copy link

linux-foundation-easycla bot commented Feb 13, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: chrischdi / name: Christian Schlotter (c0c529e)

@chrischdi chrischdi changed the title 🌱 scripts: fix checking out k/k release branch [WIP] 🌱 scripts: fix checking out k/k release branch Feb 13, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 13, 2025
@chrischdi
Copy link
Member Author

Testing this on release-1.7 to build non-1.33

@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-release-1-7
/test pull-cluster-api-e2e-blocking-release-1-7
/test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
/test pull-cluster-api-e2e-conformance-release-1-7
/test pull-cluster-api-e2e-mink8s-release-1-7
/test pull-cluster-api-e2e-release-1-7
/test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7
/test pull-cluster-api-test-mink8s-release-1-7
/test pull-cluster-api-test-release-1-7
/test pull-cluster-api-verify-release-1-7

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-release-1-7

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-release-1-7
pull-cluster-api-build-release-1-7
pull-cluster-api-e2e-blocking-release-1-7
pull-cluster-api-test-release-1-7
pull-cluster-api-verify-release-1-7

In response to this:

/test help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-7

@sbueringer
Copy link
Member

Change itself looks fine to me

@chrischdi chrischdi changed the base branch from release-1.7 to main February 13, 2025 14:24
@chrischdi chrischdi force-pushed the pr-fixup-git-checkout branch from ed85f0c to ae5e06d Compare February 13, 2025 14:24
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 13, 2025
@chrischdi
Copy link
Member Author

+ Trying to fetch branch release-1.31
From https://github.com/kubernetes/kubernetes
 * branch                    release-1.31 -> FETCH_HEAD
Note: switching to 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 1d723e38496 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.6
+ checkout release-1.31 branch
Switched to and reset branch 'release-1.31'
+ Setting version for Kubernetes build to v1.31.6-1+1d723e3849683b

Works :-) https://prow.k8s.io/log?container=test&id=1890040743741886464&job=pull-cluster-api-e2e-conformance-ci-latest-release-1-7

@sbueringer
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 556afe9f86ebf54802d7d41d0f28f7a23c026c56

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2025
@chrischdi chrischdi changed the title [WIP] 🌱 scripts: fix checking out k/k release branch 🌱 scripts: fix checking out k/k release branch Feb 13, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 13, 2025
@chrischdi
Copy link
Member Author

/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 Feb 13, 2025
@chrischdi chrischdi force-pushed the pr-fixup-git-checkout branch from ae5e06d to f045c12 Compare February 13, 2025 14:29
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2025
@sbueringer
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 79f2b97198c02dba1872bb77e38508b85b89c91b

@k8s-ci-robot k8s-ci-robot merged commit d12da22 into kubernetes-sigs:main Feb 13, 2025
17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Feb 13, 2025
@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #11839

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #11840

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #11841

In response to this:

/cherry-pick release-1.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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. area/ci Issues or PRs related to ci 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. 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.

4 participants