Merge pull request kubernetes#16520 from gmarek/fix-kubemark

Don't delete namespace after kubemark tests, as cluster will be torn …
penland365 · Nov 2, 2015 · fcbf1c1 · fcbf1c1
2 parents 0cf6549 + ce3317c
commit fcbf1c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -1468,7 +1468,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
   NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS}
   MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
   ./test/kubemark/start-kubemark.sh
-  ./test/kubemark/run-e2e-tests.sh && exitcode=0 || exitcode=$?
+  ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false"
   ./test/kubemark/stop-kubemark.sh
   NUM_MINIONS=${NUM_MINIONS_BKP}
   MASTER_SIZE=${MASTER_SIZE_BKP}

diff --git a/test/kubemark/run-e2e-tests.sh b/test/kubemark/run-e2e-tests.sh
@@ -33,10 +33,10 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
 export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/kubeconfig.loc"
 export E2E_MIN_STARTUP_PODS=0
 
-if [ -z "$@" ]; then
+if [[ -z "$@" ]]; then
 	ARGS='--ginkgo.focus=should\sallow\sstarting\s30\spods\sper\snode'
 else
 	ARGS=$@
 fi
 
-${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "$ARGS"
+${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" $ARGS