Skip to content

Commit 3eb7fd2

Browse files
committed
prow.sh: usage of Bazel optional
Bazel makes sense in the Prow jobs because those often get invoked with a pre-populated Bazel cache. But local invocation don't need it and now can turn it off with CSI_PROW_USE_BAZEL=false.
1 parent 2f3b558 commit 3eb7fd2

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

release-tools/prow.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
# The expected environment is:
3434
# - $GOPATH/src/<import path> for the repository that is to be tested,
3535
# with PR branch merged (when testing a PR)
36+
# - optional: bazel installed (when testing against Kubernetes master),
37+
# must be recent enough for Kubernetes master
3638
# - running on linux-amd64
37-
# - bazel installed (when testing against Kubernetes master), must be recent
38-
# enough for Kubernetes master
3939
# - kind (https://github.com/kubernetes-sigs/kind) installed
4040
# - optional: Go already installed
4141

@@ -101,6 +101,9 @@ kindest/node:v1.15.12@sha256:d9b939055c1e852fe3d86955ee24976cab46cba518abcb8b13b
101101
kindest/node:v1.14.10@sha256:ce4355398a704fca68006f8a29f37aafb49f8fc2f64ede3ccd0d9198da910146
102102
kindest/node:v1.13.12@sha256:1c1a48c2bfcbae4d5f4fa4310b5ed10756facad0b7a2ca93c7a4b5bae5db29f5" "kind images"
103103

104+
# Use kind node-image --type=bazel by default, but allow to disable that.
105+
configvar CSI_PROW_USE_BAZEL true "use Bazel during 'kind node-image' invocation"
106+
104107
# ginkgo test runner version to use. If the pre-installed version is
105108
# different, the desired version is built from source.
106109
configvar CSI_PROW_GINKGO_VERSION v1.7.0 "Ginkgo"
@@ -534,6 +537,8 @@ start_cluster () {
534537

535538
# Try to find a pre-built kind image if asked to use a specific version.
536539
if ! [[ "${CSI_PROW_KUBERNETES_VERSION}" =~ ^release-|^latest$ ]]; then
540+
# Ignore: See if you can use ${variable//search/replace} instead.
541+
# shellcheck disable=SC2001
537542
major_minor=$(echo "${CSI_PROW_KUBERNETES_VERSION}" | sed -e 's/^\([0-9]*\)\.\([0-9]*\).*/\1.\2/')
538543
for i in ${CSI_PROW_KIND_IMAGES}; do
539544
if echo "$i" | grep -q "kindest/node:v${major_minor}"; then
@@ -550,10 +555,15 @@ start_cluster () {
550555
if [ "$version" = "latest" ]; then
551556
version=master
552557
fi
558+
if ${CSI_PROW_USE_BAZEL}; then
559+
type="bazel"
560+
else
561+
type="docker"
562+
fi
553563
git_clone_branch https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version" || die "checking out Kubernetes $version failed"
554564

555565
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
556-
run_with_go "$go_version" kind build node-image --type bazel --image csiprow/node:latest --kube-root "${CSI_PROW_WORK}/src/kubernetes" || die "'kind build node-image' failed"
566+
run_with_go "$go_version" kind build node-image --image csiprow/node:latest --type="$type" --kube-root "${CSI_PROW_WORK}/src/kubernetes" || die "'kind build node-image' failed"
557567
csi_prow_kind_have_kubernetes=true
558568
fi
559569
image="csiprow/node:latest"

0 commit comments

Comments
 (0)