Merge pull request #57521 from misterikkit/integrationTimeout

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Allow integration test timeout override. **What this PR does / why we need it**: 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" ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57521 from misterikkit/integrationTimeout
7b4c9f99 · Kubernetes Submit Queue · GitHub · cc22b102 · 4df4c8bd · 7b4c9f99
Unverified Commit 7b4c9f99 authored Jan 07, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 07, 2018
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
+# Give integration tests longer to run by default.
-# TODO: allow a larger value to be passed in
+KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 600s}
-#KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 240s}
-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:-}