Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Run kubernetes-e2e-gce and kubernetes-e2e-gke in parallel #20276

Merged
merged 1 commit into from
Jan 29, 2016
Merged

[WIP] Run kubernetes-e2e-gce and kubernetes-e2e-gke in parallel #20276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 7 additions & 12 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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.
Expand Down
11 changes: 2 additions & 9 deletions hack/jenkins/job-configs/kubernetes-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down