Commit 03872831 authored by Dawn Chen's avatar Dawn Chen

Merge pull request #8703 from quinton-hoole/2015-05-22-jenkins-flakes

Don't clobber GINKGO_TEST_ARGS in hack/jenkins/e2e.go
parents 4ca2595e b8ca74ab
...@@ -38,7 +38,7 @@ else ...@@ -38,7 +38,7 @@ else
fi fi
# Additional parameters that are passed to ginkgo runner. # Additional parameters that are passed to ginkgo runner.
GINKGO_TEST_ARGS="" GINKGO_TEST_ARGS=${GINKGO_TEST_ARGS:-""}
if [[ "${PERFORMANCE:-}" == "true" ]]; then if [[ "${PERFORMANCE:-}" == "true" ]]; then
if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment