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

Merge pull request #22049 from wojtek-t/store_kubemark_logs 

Store logs from main cluster in kubemark only in case of failure
pull/6/head
Marek Grabowski 2016-02-26 10:44:10 +01:00
parent c1f410ee12 1f2fe27122
commit 837f6fdaee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/jenkins/e2e-runner.sh
View File

@ -192,7 +192,11 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
NUM_NODES=${KUBEMARK_NUM_NODES:-$NUM_NODES}
MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
# If start-kubemark fails, we trigger empty set of tests that would trigger storing logs from the base cluster.
./test/kubemark/start-kubemark.sh || go run ./hack/e2e.go -v --test --test_args="--ginkgo.focus=DO\sNOT\sMATCH\sANYTHING"
./test/kubemark/start-kubemark.sh && kubemark_started="$?" || kubemark_started="$?"
if [[ "${kubemark_started}" != "0" ]]; then
go run ./hack/e2e.go -v --test --test_args="--ginkgo.focus=DO\sNOT\sMATCH\sANYTHING"
exit 1
fi
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS}" --gather-resource-usage="false"
./test/kubemark/stop-kubemark.sh
NUM_NODES=${NUM_NODES_BKP}