Skip to content

Commit 36a29f5

Browse files
authored
Merge pull request #163 from pohly/remove-bazel
prow.sh: remove Bazel build support
2 parents 71c810a + 68e43ca commit 36a29f5

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

Diff for: prow.sh

+1-11
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
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
3836
# - running on linux-amd64
3937
# - kind (https://github.com/kubernetes-sigs/kind) installed
4038
# - optional: Go already installed
@@ -160,9 +158,6 @@ kindest/node:v1.16.15@sha256:430c03034cd856c1f1415d3e37faf35a3ea9c5aaa2812117b79
160158
kindest/node:v1.15.12@sha256:8d575f056493c7778935dd855ded0e95c48cb2fab90825792e8fc9af61536bf9
161159
kindest/node:v1.14.10@sha256:6033e04bcfca7c5f2a9c4ce77551e1abf385bcd2709932ec2f6a9c8c0aff6d4f" "kind images"
162160

163-
# Use kind node-image --type=bazel by default, but allow to disable that.
164-
configvar CSI_PROW_USE_BAZEL true "use Bazel during 'kind node-image' invocation"
165-
166161
# By default, this script tests sidecars with the CSI hostpath driver,
167162
# using the install_csi_driver function. That function depends on
168163
# a deployment script that it searches for in several places:
@@ -591,17 +586,12 @@ start_cluster () {
591586
if [ "$version" = "latest" ]; then
592587
version=master
593588
fi
594-
if ${CSI_PROW_USE_BAZEL}; then
595-
type="bazel"
596-
else
597-
type="docker"
598-
fi
599589
git_clone https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$(version_to_git "$version")" || die "checking out Kubernetes $version failed"
600590

601591
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
602592
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
603593
# shellcheck disable=SC2046
604-
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image --image csiprow/node:latest $(if [ "$CSI_PROW_KIND_VERSION" != "main" ]; then echo --type="$type"; fi) --kube-root "${CSI_PROW_WORK}/src/kubernetes") || die "'kind build node-image' failed"
594+
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image --image csiprow/node:latest --kube-root "${CSI_PROW_WORK}/src/kubernetes") || die "'kind build node-image' failed"
605595
csi_prow_kind_have_kubernetes=true
606596
fi
607597
image="csiprow/node:latest"

0 commit comments

Comments
 (0)