github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't delete namespace after kubemark tests, as cluster will be torn down either way

Browse Source
This commit is contained in:
gmarek 2015-10-29 18:53:56 +01:00
parent 848fed8f4b
commit ce3317cb9f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/e2e.sh
View File

@ -1436,7 +1436,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS} NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS}
MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE} MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
./test/kubemark/start-kubemark.sh ./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 ./test/kubemark/stop-kubemark.sh
NUM_MINIONS=${NUM_MINIONS_BKP} NUM_MINIONS=${NUM_MINIONS_BKP}
MASTER_SIZE=${MASTER_SIZE_BKP} MASTER_SIZE=${MASTER_SIZE_BKP}

4
test/kubemark/run-e2e-tests.sh
View File

@ -33,10 +33,10 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/kubeconfig.loc" export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/kubeconfig.loc"
export E2E_MIN_STARTUP_PODS=0 export E2E_MIN_STARTUP_PODS=0
if [ -z "$@" ]; then if [[ -z "$@" ]]; then
ARGS='--ginkgo.focus=should\sallow\sstarting\s30\spods\sper\snode' ARGS='--ginkgo.focus=should\sallow\sstarting\s30\spods\sper\snode'
else else
ARGS=$@ ARGS=$@
fi 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