From 3c9a8a3b681efd3173bfaad643172defbc06983d Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Fri, 17 Feb 2017 00:06:32 +0100
Subject: [PATCH] Modify kubemark run-e2e-tests.sh to run right command based
 on if its in docker/normal environment

---
 test/kubemark/run-e2e-tests.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/kubemark/run-e2e-tests.sh b/test/kubemark/run-e2e-tests.sh
index e911c15ac5c..beed23146d0 100755
--- a/test/kubemark/run-e2e-tests.sh
+++ b/test/kubemark/run-e2e-tests.sh
@@ -38,6 +38,10 @@ else
 	ARGS=$@
 fi
 
-go run ./hack/e2e.go -v --check_version_skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"
-# Just make local test easier...
-# ${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" $ARGS
+if [[ -f /.dockerenv ]]; then
+	# Running inside a dockerized runner.
+	go run ./hack/e2e.go -v --check_version_skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"
+else
+	# Running locally.
+	${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" $ARGS
+fi