Skip to content

Commit

Permalink
Merge pull request kubernetes#25001 from gmarek/jenkins
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Default KUBEMARK_TEST_ARGS
  • Loading branch information
k8s-merge-robot committed May 4, 2016
2 parents d2f70ef + 07f1b2f commit bacb12a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hack/jenkins/e2e-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
# If start-kubemark fails, we trigger empty set of tests that would trigger storing logs from the base cluster.
./test/kubemark/start-kubemark.sh || dump_cluster_logs_and_exit
# Similarly, if tests fail, we trigger empty set of tests that would trigger storing logs from the base cluster.
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS}" "${KUBEMARK_TEST_ARGS}" || dump_cluster_logs_and_exit
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS:-starting\s30\spods}" "${KUBEMARK_TEST_ARGS:-}" || dump_cluster_logs_and_exit
./test/kubemark/stop-kubemark.sh
NUM_NODES=${NUM_NODES_BKP}
MASTER_SIZE=${MASTER_SIZE_BKP}
Expand Down

0 comments on commit bacb12a

Please sign in to comment.