From 4df4c8bdd2207104c4596b789186ac4f29fde6aa Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Thu, 21 Dec 2017 09:42:54 -0800 Subject: [PATCH] Allow integration test timeout override. This allows the test timeout to be overridden at the command line for integration tests. The default behavior is unchanged. e.g. make test-integration WHAT="./test/integration/scheduler" \ KUBE_TEST_ARGS="-run=. -count=10" \ KUBE_TIMEOUT="-timeout 1h" --- hack/make-rules/test-integration.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index c180f45e89e..b545e2574c2 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -30,10 +30,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" ALL_VERSIONS_CSV=$(IFS=',';echo "${KUBE_AVAILABLE_GROUP_VERSIONS[*]// /,}";IFS=$) KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS:-${ALL_VERSIONS_CSV}}" -# Give integration tests longer to run -# TODO: allow a larger value to be passed in -#KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 240s} -KUBE_TIMEOUT="-timeout 600s" +# Give integration tests longer to run by default. +KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 600s} KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY:-"-1"} LOG_LEVEL=${LOG_LEVEL:-2} KUBE_TEST_ARGS=${KUBE_TEST_ARGS:-}