mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-08 03:33:56 +00:00
Merge pull request #118349 from bart0sh/PR116-fix-ginkgo-deprecation-warning
Fix ginkgo deprecation warning
This commit is contained in:
commit
f812ac5445
@ -213,7 +213,7 @@ define TEST_E2E_NODE_HELP_INFO
|
||||
# Defaults to "\[Flaky\]|\[Slow\]|\[Serial\]".
|
||||
# TEST_ARGS: A space-separated list of arguments to pass to node e2e test.
|
||||
# Defaults to "".
|
||||
# RUN_UNTIL_FAILURE: If true, pass --untilItFails to ginkgo so tests are run
|
||||
# RUN_UNTIL_FAILURE: If true, pass --until-it-fails=true to ginkgo so tests are run
|
||||
# repeatedly until they fail. Defaults to false.
|
||||
# REMOTE: If true, run the tests on a remote host. Defaults to false.
|
||||
# REMOTE_MODE: For REMOTE=true only. Mode for remote execution (eg. gce, ssh).
|
||||
|
@ -149,7 +149,7 @@ if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then
|
||||
fi
|
||||
|
||||
if [[ "${GINKGO_UNTIL_IT_FAILS:-}" == true ]]; then
|
||||
ginkgo_args+=("--untilItFails=true")
|
||||
ginkgo_args+=("--until-it-fails=true")
|
||||
fi
|
||||
|
||||
FLAKE_ATTEMPTS=1
|
||||
|
@ -66,8 +66,8 @@ if [[ ${skip} != "" ]]; then
|
||||
ginkgoflags="${ginkgoflags} -skip=\"${skip}\" "
|
||||
fi
|
||||
|
||||
if [[ ${run_until_failure} != "" ]]; then
|
||||
ginkgoflags="${ginkgoflags} -untilItFails=${run_until_failure} "
|
||||
if [[ ${run_until_failure} == "true" ]]; then
|
||||
ginkgoflags="${ginkgoflags} --until-it-fails=true "
|
||||
fi
|
||||
|
||||
# Setup the directory to copy test artifacts (logs, junit.xml, etc) from remote host to local host
|
||||
|
Loading…
Reference in New Issue
Block a user