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

Merge pull request #13030 from justinsb/aws_jenkins_parallel 

AWS: e2e: change instance default size, create kubernetes-e2e-aws-parallel
pull/6/head
Zach Loafman 2015-08-21 16:06:56 -07:00
parent f433efef8d e7ce72cf35
commit 29369b0dde
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hack/jenkins/e2e.sh
View File

@ -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
@ -209,6 +210,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"}