Merge pull request #20278 from ihmccreery/gke-slow

Make slow tests run in parallel, add gke-slow suite
This commit is contained in:
Fabio Yeon 2016-01-28 20:42:44 -08:00
commit 03a26330a8
2 changed files with 17 additions and 3 deletions

View File

@ -383,9 +383,9 @@ case ${JOB_NAME} in
kubernetes-e2e-gce-slow)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-slow"}
: ${E2E_NETWORK:="e2e-slow"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Slow\] \
--ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"}
: ${GINKGO_PARALLEL:="y"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-slow"}
: ${PROJECT:="k8s-jkns-e2e-gce-slow"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
@ -603,6 +603,17 @@ case ${JOB_NAME} in
)"}
;;
kubernetes-e2e-gke-slow)
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-slow"}
: ${E2E_NETWORK:="e2e-gke-slow"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-e2e-gke-slow"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Slow\] \
--ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"}
: ${GINKGO_PARALLEL:="y"}
;;
# Run the GCE_PARALLEL_SKIP_TESTS on GKE.
kubernetes-e2e-gke-ci-reboot)
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"}

View File

@ -86,6 +86,9 @@
- cluster (k8s): ci/latest.txt<br>
- tests: ci/latest.txt
timeout: 300
- 'gke-slow':
description: 'Run slow E2E tests on GKE using the latest successful build.'
timeout: 300
- 'gke-ci-reboot':
description: |
Run e2e tests using the following config:<br>