Merge pull request #76871 from cblecker/shellcheck-colour

Fix malformed JUNIT XML with shellcheck failures
This commit is contained in:
Kubernetes Prow Robot 2019-04-22 14:38:19 -07:00 committed by GitHub
commit 588ea5d757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -123,6 +123,13 @@ else
fi
fi
# if KUBE_JUNIT_REPORT_DIR is set, disable colorized output.
# Colorized output causes malformed XML in the JUNIT report.
SHELLCHECK_COLORIZED_OUTPUT="auto"
if [[ -n "${KUBE_JUNIT_REPORT_DIR:-}" ]]; then
SHELLCHECK_COLORIZED_OUTPUT="never"
fi
# common arguments we'll pass to shellcheck
SHELLCHECK_OPTIONS=(
# allow following sourced files that are not specified in the command,
@ -131,6 +138,8 @@ SHELLCHECK_OPTIONS=(
"--external-sources"
# include our disabled lints
"--exclude=${SHELLCHECK_DISABLED}"
# set colorized output
"--color=${SHELLCHECK_COLORIZED_OUTPUT}"
)
# lint each script, tracking failures