Skip to content

Commit c14c373

Browse files
committed
Squashed 'release-tools/' changes from 22c0395c..4aff857d
4aff857d Merge pull request kubernetes-csi#109 from pohly/alpha-test-defaults 0427289d Merge pull request kubernetes-csi#110 from pohly/kind-0.9-bazel-build-workaround 9a370ab9 prow.sh: work around "kind build node-image" failure 522361ec prow.sh: only run alpha tests for latest Kubernetes release git-subtree-dir: release-tools git-subtree-split: 4aff857d88149e07951fcd1322f462f765401a86
1 parent 9df5ce5 commit c14c373

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

prow.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,16 @@ configvar CSI_PROW_DEP_VERSION v0.5.1 "golang dep version to be used for vendor
248248
#
249249
# Unknown or unsupported entries are ignored.
250250
#
251+
# Testing of alpha features is only supported for CSI_PROW_KUBERNETES_VERSION=latest
252+
# because CSI_PROW_E2E_ALPHA and CSI_PROW_E2E_ALPHA_GATES are not set for
253+
# older Kubernetes releases. The script supports that, it just isn't done because
254+
# it is not needed and would cause additional maintenance effort.
255+
#
251256
# Sanity testing with csi-sanity only covers the CSI driver itself and
252257
# thus only makes sense in repos which provide their own CSI
253258
# driver. Repos can enable sanity testing by setting
254259
# CSI_PROW_TESTS_SANITY=sanity.
255-
configvar CSI_PROW_TESTS "unit parallel serial parallel-alpha serial-alpha sanity" "tests to run"
260+
configvar CSI_PROW_TESTS "unit parallel serial $(if [ "${CSI_PROW_KUBERNETES_VERSION}" = "latest" ]; then echo parallel-alpha serial-alpha; fi) sanity" "tests to run"
256261
tests_enabled () {
257262
local t1 t2
258263
# We want word-splitting here, so ignore: Quote to prevent word splitting, or split robustly with mapfile or read -a.
@@ -558,7 +563,8 @@ start_cluster () {
558563
git_clone_branch https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version" || die "checking out Kubernetes $version failed"
559564

560565
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
561-
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"
566+
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
567+
(cd "${CSI_PROW_WORK}/src/kubernetes" && 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"
562568
csi_prow_kind_have_kubernetes=true
563569
fi
564570
image="csiprow/node:latest"

0 commit comments

Comments
 (0)