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

[release-1.9] 🌱 scripts: fix checking out k/k release branch #11841

Merged
merged 1 commit into from
Feb 13, 2025
Merged

[release-1.9] 🌱 scripts: fix checking out k/k release branch #11841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions scripts/ci-e2e-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ kind::prepareKindestImage() {

# if pre-pull failed, or ALWAYS_BUILD_KIND_IMAGES is true build the images locally.
if [[ "$retVal" != 0 ]] || [[ "$ALWAYS_BUILD_KIND_IMAGES" = "true" ]]; then
echo "+ building image for Kuberentes $version locally. This is either because the image wasn't available in docker hub or ALWAYS_BUILD_KIND_IMAGES is set to true"
echo "+ building image for Kubernetes $version locally. This is either because the image wasn't available in docker hub or ALWAYS_BUILD_KIND_IMAGES is set to true"
kind::buildNodeImage "$version"
fi
}
Expand Down Expand Up @@ -221,16 +221,19 @@ k8s::checkoutBranch() {
else
# otherwise we are requiring a Kubernetes version that should be built from HEAD
# of one of the existing branches
echo "+ checking for existing branches"
git fetch --all

local major
local minor
major=$(echo "${version#v}" | awk '{split($0,a,"."); print a[1]}')
minor=$(echo "${version#v}" | awk '{split($0,a,"."); print a[2]}')

echo "+ Trying to fetch branch release-$major.$minor"
# shellcheck disable=SC2015
git fetch --filter=blob:none https://github.com/kubernetes/kubernetes.git "release-$major.$minor" \
&& git checkout FETCH_HEAD \
&& git branch --force "release-$major.$minor" || true

local releaseBranch
releaseBranch="$(git branch -r | grep "release-$major.$minor$" || true)"
releaseBranch="$(git branch | grep "release-$major.$minor$" | awk '{print $NF}' || true)"
if [[ "$releaseBranch" != "" ]]; then
# if there is already a release branch for the required Kubernetes branch, use it
echo "+ checkout $releaseBranch branch"
Expand Down