mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
ginkgo: disable color escape sequences by default when not connected to a terminal
This applies to all jobs using hack/ginkgo-e2e.sh. This is done because Spyglass does not render the escape sequences, making test output harder to read. It is done here because then we don't need to set GINKGO_NO_COLOR in all the different Prow job configs.
This commit is contained in:
parent
cdc60112a6
commit
9ff8bdbd25
@ -34,9 +34,12 @@ e2e_test=$(kube::util::find-binary "e2e.test")
|
||||
GINKGO_PARALLEL=${GINKGO_PARALLEL:-n} # set to 'y' to run tests in parallel
|
||||
CLOUD_CONFIG=${CLOUD_CONFIG:-""}
|
||||
|
||||
# If 'y', Ginkgo's reporter will not print out in color when tests are run
|
||||
# in parallel
|
||||
GINKGO_NO_COLOR=${GINKGO_NO_COLOR:-n}
|
||||
# If 'y', Ginkgo's reporter will not use escape sequence to color output.
|
||||
#
|
||||
# Since Kubernetes 1.25, the default is to use colors only when connected to
|
||||
# a terminal. That is the right choice for all Prow jobs (Spyglass doesn't
|
||||
# render them properly).
|
||||
GINKGO_NO_COLOR=${GINKGO_NO_COLOR:-$(if [ -t 2 ]; then echo n; else echo y; fi)}
|
||||
|
||||
# If 'y', will rerun failed tests once to give them a second chance.
|
||||
GINKGO_TOLERATE_FLAKES=${GINKGO_TOLERATE_FLAKES:-n}
|
||||
@ -148,7 +151,7 @@ if [[ "${GINKGO_TOLERATE_FLAKES}" == "y" ]]; then
|
||||
fi
|
||||
|
||||
if [[ "${GINKGO_NO_COLOR}" == "y" ]]; then
|
||||
ginkgo_args+=("--noColor")
|
||||
ginkgo_args+=("--no-color")
|
||||
fi
|
||||
|
||||
# The --host setting is used only when providing --auth_config
|
||||
|
Loading…
Reference in New Issue
Block a user