From e7ce72cf3529dd88ea05cc450155ab48a45cb5b4 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 21 Aug 2015 07:53:32 -0400 Subject: [PATCH] AWS: Add kubernetes-e2e-aws-parallel for Jenkins This should allow us to run tests on AWS much faster. --- hack/jenkins/e2e.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index e1fdd11e558..3e2a6b9208e 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -80,8 +80,9 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then : ${NUM_MINIONS:="100"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Performance\ssuite\]"} else - : ${MASTER_SIZE:="t2.small"} - : ${NUM_MINIONS:="2"} + : ${MASTER_SIZE:="m3.large"} + : ${MINION_SIZE:="m3.large"} + : ${NUM_MINIONS:="3"} fi fi @@ -206,6 +207,20 @@ case ${JOB_NAME} in NUM_MINIONS="6" ;; + # Runs all non-flaky tests on AWS in parallel. + kubernetes-e2e-aws-parallel) + : ${E2E_CLUSTER_NAME:="jenkins-aws-e2e-parallel"} + : ${E2E_NETWORK:="e2e-parallel"} + : ${GINKGO_PARALLEL:="y"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ + ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ + ${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \ + ${GCE_PARALLEL_FLAKY_TESTS[@]:+${GCE_PARALLEL_FLAKY_TESTS[@]}} \ + )"} + # Override AWS defaults. + NUM_MINIONS="6" + ;; + # Runs the flaky tests on GCE in parallel. kubernetes-e2e-gce-parallel-flaky) : ${E2E_CLUSTER_NAME:="parallel-flaky"}