Merge pull request #30336 from fejta/fix

Automatic merge from submit-queue Do not require --test_args to be set Fixes kubernetes/kubernetes#30322 Not all jobs set `GINKGO_TEST_ARGS`, such as many of the gke tests. When this is unset all test to run (or just federated tests if in that mode).  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30336)

Merge pull request #30336 from fejta/fix
c10f95de · Kubernetes Submit Queue · GitHub · 97d65ce8 · 8ca5759b · c10f95de
Commit c10f95de authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

e2e-runner.sh hack/jenkins/e2e-runner.sh +4 -1

No files found.
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -376,7 +376,10 @@ if [[ "${E2E_DOWN,,}" == "true" ]]; then
 fi

 if [[ "${E2E_TEST,,}" == "true" ]]; then
-  e2e_go_args+=(--test --test_args="${GINKGO_TEST_ARGS}")
+  e2e_go_args+=(--test)
+  if [[ -n "${GINKGO_TEST_ARGS:-}" ]]; then
+    e2e_go_args+=(--test_args="${GINKGO_TEST_ARGS}")
+  fi
 fi

 # Optionally run tests from the version in  kubernetes_skew