Merge pull request kubernetes#19586 from yifan-gu/ginkgo_parallel

Auto commit by PR queue bot
satnam6502 · Jan 21, 2016 · 0c368c0 · 0c368c0
2 parents 0f6f521 + eb9c5ae
commit 0c368c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
@@ -81,8 +81,10 @@ if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then
   ginkgo_args+=("--skip=${CONFORMANCE_TEST_SKIP_REGEX}")
   ginkgo_args+=("--seed=1436380640")
 fi
-if [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then
-  ginkgo_args+=("-p")
+if [[ -n "${GINKGO_PARALLEL_NODES:-}" ]]; then
+  ginkgo_args+=("--nodes=${GINKGO_PARALLEL_NODES}")
+elif [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then
+  ginkgo_args+=("--nodes=30") # By default, set --nodes=30.
 fi
 
 

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -1017,6 +1017,7 @@ export E2E_DOWN="${E2E_DOWN:-true}"
 export E2E_CLEAN_START="${E2E_CLEAN_START:-}"
 # Used by hack/ginkgo-e2e.sh to enable ginkgo's parallel test runner.
 export GINKGO_PARALLEL=${GINKGO_PARALLEL:-}
+export GINKGO_PARALLEL_NODES=${GINKGO_PARALLEL_NODES:-}
 export GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-}"
 
 # If we are on PR Jenkins merging into master, use the local e2e.sh. Otherwise, use the latest on github.