mirror of https://github.com/k3s-io/k3s
Merge pull request #42797 from joseph-lanoux/ginkgo_nocolor
Automatic merge from submit-queue Fix the ginkgo nocolor parameter When running the e2e tests in parallel, the ginkgo nocolor is not honored and produces a colored output. This change fixes this issue (#42793). **What this PR does / why we need it**: It fixes the ginkgo color parameter when running e2e tests in parallel. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #42793 **Special notes for your reviewer**: It seems there is a missing bit in ginkgo-e2e.sh so I added it. **Release note**: ```release-note ```pull/6/head
commit
72207db455
|
@ -30,6 +30,10 @@ e2e_test=$(kube::util::find-binary "e2e.test")
|
|||
|
||||
GINKGO_PARALLEL=${GINKGO_PARALLEL:-n} # set to 'y' to run tests in parallel
|
||||
|
||||
# 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', will rerun failed tests once to give them a second chance.
|
||||
GINKGO_TOLERATE_FLAKES=${GINKGO_TOLERATE_FLAKES:-n}
|
||||
|
||||
|
@ -113,6 +117,10 @@ if [[ "${GINKGO_TOLERATE_FLAKES}" == "y" ]]; then
|
|||
FLAKE_ATTEMPTS=2
|
||||
fi
|
||||
|
||||
if [[ "${GINKGO_NO_COLOR}" == "y" ]]; then
|
||||
ginkgo_args+=("--noColor")
|
||||
fi
|
||||
|
||||
# The --host setting is used only when providing --auth_config
|
||||
# If --kubeconfig is used, the host to use is retrieved from the .kubeconfig
|
||||
# file and the one provided with --host is ignored.
|
||||
|
|
Loading…
Reference in New Issue