github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16520 from gmarek/fix-kubemark 

Don't delete namespace after kubemark tests, as cluster will be torn …
pull/6/head
Piotr Szczesniak 2015-11-02 10:13:37 +01:00
parent 0cf6549552 ce3317cb9f
commit fcbf1c1012
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

@ -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}

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 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