Squashed 'release-tools/' changes from 6616a6b5..f3255906

https://github.com/kubernetes-csi/csi-release-tools/commit/f3255906 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/149 from pohly/cluster-logs
https://github.com/kubernetes-csi/csi-release-tools/commit/4b03b308 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/155 from pohly/owners
https://github.com/kubernetes-csi/csi-release-tools/commit/a6453c86 owners: introduce aliases
https://github.com/kubernetes-csi/csi-release-tools/commit/ad83def4 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/153 from pohly/fix-image-builds
https://github.com/kubernetes-csi/csi-release-tools/commit/55617801 build.make: fix image publishng
https://github.com/kubernetes-csi/csi-release-tools/commit/29bd39b3 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/152 from pohly/bump-csi-test
https://github.com/kubernetes-csi/csi-release-tools/commit/bc427931 prow.sh: use csi-test v4.2.0
https://github.com/kubernetes-csi/csi-release-tools/commit/b546baaf Merge https://github.com/kubernetes-csi/csi-release-tools/pull/150 from mauriciopoppe/windows-multiarch-args
https://github.com/kubernetes-csi/csi-release-tools/commit/bfbb6f35 add parameter base_image and addon_image to BUILD_PARAMETERS
https://github.com/kubernetes-csi/csi-release-tools/commit/2d61d3bc Merge https://github.com/kubernetes-csi/csi-release-tools/pull/151 from humblec/cm
https://github.com/kubernetes-csi/csi-release-tools/commit/48e71f06 Replace `which` command ( non standard)  with `command -v` builtin
https://github.com/kubernetes-csi/csi-release-tools/commit/feb20e26 prow.sh: collect cluster logs
https://github.com/kubernetes-csi/csi-release-tools/commit/7b96bea3 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/148 from dobsonj/add-checkpathcmd-to-prow
https://github.com/kubernetes-csi/csi-release-tools/commit/2d2e03b7 prow.sh: enable -csi.checkpathcmd option in csi-sanity
https://github.com/kubernetes-csi/csi-release-tools/commit/09d41512 Merge https://github.com/kubernetes-csi/csi-release-tools/pull/147 from pohly/mock-testing
https://github.com/kubernetes-csi/csi-release-tools/commit/74cfbc97 prow.sh: support mock tests
https://github.com/kubernetes-csi/csi-release-tools/commit/4a3f1103 prow.sh: remove obsolete test suppression

git-subtree-dir: release-tools
git-subtree-split: f3255906abf2e4134cb3db4ff79ddfb5ce1e91aa
This commit is contained in:
Patrick Ohly
2021-05-21 09:31:20 +02:00
parent 4abab596c1
commit a6a467e059
7 changed files with 173 additions and 39 deletions

View File

@@ -84,7 +84,7 @@ done < <(find . -name "*.sh" \
# detect if the host machine has the required shellcheck version installed
# if so, we will use that instead.
HAVE_SHELLCHECK=false
if which shellcheck &>/dev/null; then
if command -v shellcheck &>/dev/null; then
detected_version="$(shellcheck --version | grep 'version: .*')"
if [[ "${detected_version}" = "version: ${SHELLCHECK_VERSION}" ]]; then
HAVE_SHELLCHECK=true