github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Run kubernetes-e2e-gce and kubernetes-e2e-gce in parallel

Browse Source
This commit is contained in:
Isaac Hollander McCreery 2016-01-28 09:53:55 -08:00
parent 146a9e6075
commit 1ce8e2345e
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hack/jenkins/e2e.sh
View File

@ -304,16 +304,13 @@ GCE_PARALLEL_SKIP_TESTS=(
# release branches defines relevant jobs for that particular version of
# Kubernetes.
case ${JOB_NAME} in
# Runs all non-flaky, non-slow tests on GCE, sequentially.
# Runs all non-slow, non-serial, non-flaky, tests on GCE in parallel.
kubernetes-e2e-gce)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e"}
: ${E2E_PUBLISH_GREEN_VERSION:="true"}
: ${E2E_NETWORK:="e2e-gce"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"}
: ${GINKGO_PARALLEL:="y"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
: ${PROJECT:="k8s-jkns-e2e-gce"}
: ${ENABLE_DEPLOYMENTS:=true}
@ -591,17 +588,15 @@ case ${JOB_NAME} in
: ${PROJECT:="kubernetes-jenkins"}
;;
kubernetes-e2e-gke-ci)
# Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel.
kubernetes-e2e-gke)
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci"}
: ${E2E_NETWORK:="e2e-gke-ci"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-e2e-gke-ci"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"}
: ${GINKGO_PARALLEL:="y"}
;;
# Run the GCE_PARALLEL_SKIP_TESTS on GKE.

11
hack/jenkins/job-configs/kubernetes-e2e.yaml
View File

@ -73,15 +73,8 @@
branch: 'master'
emails: '$DEFAULT_RECIPIENTS, cloud-kubernetes-alerts@google.com'
suffix:
- 'gke-ci':
description: |
Run e2e tests using the following config:<br>
- provider: GKE<br>
- apiary: staging<br>
- borg job: test<br>
- client (kubectl): ci/latest.txt<br>
- cluster (k8s): ci/latest.txt<br>
- tests: ci/latest.txt
- 'gke':
description: Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel (against GKE test endpoint)
timeout: 300
- 'gke-ci-reboot':
description: |