Skip to content

K
k3s
Commit 72207db4 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 964e1553 b2560666
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
hack/ginkgo-e2e.sh
View file @ 72207db4
...@@ -30,6 +30,10 @@ e2e_test=$(kube::util::find-binary "e2e.test") ...@@ -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 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. # If 'y', will rerun failed tests once to give them a second chance.
GINKGO_TOLERATE_FLAKES=${GINKGO_TOLERATE_FLAKES:-n} GINKGO_TOLERATE_FLAKES=${GINKGO_TOLERATE_FLAKES:-n}
...@@ -113,6 +117,10 @@ if [[ "${GINKGO_TOLERATE_FLAKES}" == "y" ]]; then ...@@ -113,6 +117,10 @@ if [[ "${GINKGO_TOLERATE_FLAKES}" == "y" ]]; then
FLAKE_ATTEMPTS=2 FLAKE_ATTEMPTS=2
fi fi
if [[ "${GINKGO_NO_COLOR}" == "y" ]]; then
ginkgo_args+=("--noColor")
fi
# The --host setting is used only when providing --auth_config # The --host setting is used only when providing --auth_config
# If --kubeconfig is used, the host to use is retrieved from the .kubeconfig # If --kubeconfig is used, the host to use is retrieved from the .kubeconfig
# file and the one provided with --host is ignored. # file and the one provided with --host is ignored.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment