github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Add timeout config for node_e2e tests

Browse Source 
Some test suits use more than the default 45m, resulting in the test to
crash.
This commit is contained in:
Odin Ugedal 2019-09-28 11:39:24 +02:00 committed by Odin Ugedal
parent 7db8a431da
commit 6dfdf05eaa
No known key found for this signature in database
GPG Key ID: AFF9C8242CF7A7AF
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/root/Makefile
View File

@ -222,6 +222,8 @@ define TEST_E2E_NODE_HELP_INFO
# Defaults to "/tmp/_artifacts/$$(date +%y%m%dT%H%M%S)". # Defaults to "/tmp/_artifacts/$$(date +%y%m%dT%H%M%S)".
# LIST_IMAGES: For REMOTE=true only. If true, don't run tests. Just output the # LIST_IMAGES: For REMOTE=true only. If true, don't run tests. Just output the
# list of available images for testing. Defaults to false. # list of available images for testing. Defaults to false.
# TIMEOUT: For REMOTE=true only. How long (in golang duration format) to wait
# for ginkgo tests to complete. Defaults to 45m.
# PARALLELISM: The number of ginkgo nodes to run. Defaults to 8. # PARALLELISM: The number of ginkgo nodes to run. Defaults to 8.
# RUNTIME: Container runtime to use (eg. docker, remote). # RUNTIME: Container runtime to use (eg. docker, remote).
# Defaults to "docker". # Defaults to "docker".

5
hack/make-rules/test-e2e-node.sh
View File

@ -41,6 +41,7 @@ container_runtime_endpoint=${CONTAINER_RUNTIME_ENDPOINT:-""}
image_service_endpoint=${IMAGE_SERVICE_ENDPOINT:-""} image_service_endpoint=${IMAGE_SERVICE_ENDPOINT:-""}
run_until_failure=${RUN_UNTIL_FAILURE:-"false"} run_until_failure=${RUN_UNTIL_FAILURE:-"false"}
test_args=${TEST_ARGS:-""} test_args=${TEST_ARGS:-""}
timeout_arg=""
system_spec_name=${SYSTEM_SPEC_NAME:-} system_spec_name=${SYSTEM_SPEC_NAME:-}
extra_envs=${EXTRA_ENVS:-} extra_envs=${EXTRA_ENVS:-}
@ -104,6 +105,9 @@ if [ "${remote}" = true ] ; then
delete_instances=${DELETE_INSTANCES:-"false"} delete_instances=${DELETE_INSTANCES:-"false"}
preemptible_instances=${PREEMPTIBLE_INSTANCES:-"false"} preemptible_instances=${PREEMPTIBLE_INSTANCES:-"false"}
test_suite=${TEST_SUITE:-"default"} test_suite=${TEST_SUITE:-"default"}
if [[ -n "${TIMEOUT:-}" ]] ; then
timeout_arg="--test-timeout=${TIMEOUT}"
fi
# Get the compute zone # Get the compute zone
zone=${ZONE:-"$(gcloud info --format='value(config.properties.compute.zone)')"} zone=${ZONE:-"$(gcloud info --format='value(config.properties.compute.zone)')"}
@ -159,6 +163,7 @@ if [ "${remote}" = true ] ; then
--delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \
--image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \
--preemptible-instances="${preemptible_instances}" --extra-envs="${extra_envs}" --test-suite="${test_suite}" \ --preemptible-instances="${preemptible_instances}" --extra-envs="${extra_envs}" --test-suite="${test_suite}" \
"${timeout_arg}" \
2>&1 | tee -i "${artifacts}/build-log.txt" 2>&1 | tee -i "${artifacts}/build-log.txt"
exit $? exit $?