diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh index d676f54a92..18143c30ef 100755 --- a/hack/jenkins/e2e-runner.sh +++ b/hack/jenkins/e2e-runner.sh @@ -185,7 +185,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then NUM_NODES=${KUBEMARK_NUM_NODES:-$NUM_NODES} MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE} ./test/kubemark/start-kubemark.sh - ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false" --gather-resource-usage="false" + ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS}" --delete-namespace="false" --gather-resource-usage="false" ./test/kubemark/stop-kubemark.sh NUM_NODES=${NUM_NODES_BKP} MASTER_SIZE=${MASTER_SIZE_BKP} diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 728c9caba0..33d87ea097 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -659,6 +659,7 @@ case ${JOB_NAME} in : ${E2E_DOWN:="true"} : ${E2E_TEST:="false"} : ${USE_KUBEMARK:="true"} + : ${KUBEMARK_TESTS:="\[Feature:Performance\]"} # Override defaults to be indpendent from GCE defaults and set kubemark parameters KUBE_GCE_INSTANCE_PREFIX="kubemark100" NUM_NODES="10" @@ -679,6 +680,7 @@ case ${JOB_NAME} in : ${E2E_DOWN:="true"} : ${E2E_TEST:="false"} : ${USE_KUBEMARK:="true"} + : ${KUBEMARK_TESTS:="\[Feature:Performance\]"} # Override defaults to be indpendent from GCE defaults and set kubemark parameters NUM_NODES="6" MASTER_SIZE="n1-standard-4" @@ -698,6 +700,7 @@ case ${JOB_NAME} in : ${E2E_DOWN:="true"} : ${E2E_TEST:="false"} : ${USE_KUBEMARK:="true"} + : ${KUBEMARK_TESTS:="should\sallow\sstarting\s30\spods\sper\snode"} # Override defaults to be indpendent from GCE defaults and set kubemark parameters # We need 11 so that we won't hit max-pods limit (set to 100). TODO: do it in a nicer way. NUM_NODES="11" @@ -1029,6 +1032,7 @@ export KUBE_SKIP_CONFIRMATIONS=y # Kubemark export USE_KUBEMARK="${USE_KUBEMARK:-false}" +export KUBEMARK_TESTS="${KUBEMARK_TESTS:-}" export KUBEMARK_MASTER_SIZE="${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}" export KUBEMARK_NUM_NODES="${KUBEMARK_NUM_NODES:-$NUM_NODES}"