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"

Allow integration test timeout override.
4df4c8bd · Jonathan Basseri · 8bd5a460 · 4df4c8bd
Commit 4df4c8bd authored Dec 21, 2017 by Jonathan Basseri
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

test-integration.sh hack/make-rules/test-integration.sh +2 -4

No files found.
--- 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:-}