Skip to content

Commit df518fb

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 c3afd42 commit df518fb

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

Diff for: prow.sh

+11-3
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

@@ -111,6 +111,9 @@ configvar CSI_PROW_GO_VERSION_GINKGO "${CSI_PROW_GO_VERSION_BUILD}" "Go version
111111
# (if available), otherwise it is built from source.
112112
configvar CSI_PROW_KIND_VERSION "v0.6.0" "kind"
113113

114+
# Use kind node-image --type=bazel by default, but allow to disable that.
115+
configvar CSI_PROW_USE_BAZEL true "use Bazel during 'kind node-image' invocation"
116+
114117
# ginkgo test runner version to use. If the pre-installed version is
115118
# different, the desired version is built from source.
116119
configvar CSI_PROW_GINKGO_VERSION v1.7.0 "Ginkgo"
@@ -537,10 +540,15 @@ start_cluster () {
537540
if [ "$version" = "latest" ]; then
538541
version=master
539542
fi
543+
if ${CSI_PROW_USE_BAZEL}; then
544+
type="bazel"
545+
else
546+
type="docker"
547+
fi
540548
git_clone_branch https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version" || die "checking out Kubernetes $version failed"
541549

542550
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
543-
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"
551+
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"
544552
csi_prow_kind_have_kubernetes=true
545553
fi
546554
image="csiprow/node:latest"

0 commit comments

Comments
 (0)