mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 02:41:25 +00:00
Fix shellcheck output streams
Resolves https://github.com/kubernetes/kubernetes/issues/102975 shellcheck errors are printed to stdout by default, hence they need to be redirected to stderr in order to be well parsed for Junit representation by `juLog` function.
This commit is contained in:
parent
eb729620c5
commit
bcb5d29e90
@ -102,16 +102,18 @@ SHELLCHECK_OPTIONS=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# tell the user which we've selected and lint all scripts
|
# tell the user which we've selected and lint all scripts
|
||||||
|
# The shellcheck errors are printed to stdout by default, hence they need to be redirected
|
||||||
|
# to stderr in order to be well parsed for Junit representation by juLog function
|
||||||
res=0
|
res=0
|
||||||
if ${HAVE_SHELLCHECK}; then
|
if ${HAVE_SHELLCHECK}; then
|
||||||
echo "Using host shellcheck ${SHELLCHECK_VERSION} binary."
|
echo "Using host shellcheck ${SHELLCHECK_VERSION} binary."
|
||||||
shellcheck "${SHELLCHECK_OPTIONS[@]}" "${all_shell_scripts[@]}" || res=$?
|
shellcheck "${SHELLCHECK_OPTIONS[@]}" "${all_shell_scripts[@]}" >&2 || res=$?
|
||||||
else
|
else
|
||||||
echo "Using shellcheck ${SHELLCHECK_VERSION} docker image."
|
echo "Using shellcheck ${SHELLCHECK_VERSION} docker image."
|
||||||
"${DOCKER}" run \
|
"${DOCKER}" run \
|
||||||
--rm -v "${KUBE_ROOT}:${KUBE_ROOT}" -w "${KUBE_ROOT}" \
|
--rm -v "${KUBE_ROOT}:${KUBE_ROOT}" -w "${KUBE_ROOT}" \
|
||||||
"${SHELLCHECK_IMAGE}" \
|
"${SHELLCHECK_IMAGE}" \
|
||||||
shellcheck "${SHELLCHECK_OPTIONS[@]}" "${all_shell_scripts[@]}" || res=$?
|
shellcheck "${SHELLCHECK_OPTIONS[@]}" "${all_shell_scripts[@]}" >&2 || res=$?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# print a message based on the result
|
# print a message based on the result
|
||||||
|
Loading…
Reference in New Issue
Block a user