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

Add gce-serial and gke-serial jobs #19713

Merged
merged 2 commits into from
Jan 15, 2016
Merged

Add gce-serial and gke-serial jobs #19713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e61f661
Add gce-serial and gke-serial jobs to start deflaking serial, disrupt…
Jan 15, 2016
78ea78e
Collapse into one project
Jan 15, 2016
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
34 changes: 33 additions & 1 deletion hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ case ${JOB_NAME} in
NUM_NODES=${NUM_NODES_PARALLEL}
;;

# Run the DISRUPTIVE_TESTS on GCE. (#19681)
# Run the Reboot tests on GCE. (#19681)
kubernetes-e2e-gce-reboot)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"}
: ${E2E_NETWORK:="e2e-reboot"}
Expand All @@ -507,6 +507,38 @@ case ${JOB_NAME} in
: ${PROJECT:="kubernetes-jenkins"}
;;

# Run the [Serial], [Disruptive], and [Feature:Restart] tests on GCE.
kubernetes-e2e-gce-serial)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-serial"}
: ${E2E_NETWORK:="jenkins-gce-e2e-serial"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
\[Serial\] \
\[Disruptive\] \
\[Feature:Restart\] \
) --ginkgo.skip=$(join_regex_no_empty \
\[Flaky\]
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"}
: ${PROJECT:="kubernetes-jkns-e2e-gce-serial"}
;;

# Run the [Serial], [Disruptive], and [Feature:Restart] tests on GKE.
kubernetes-e2e-gke-serial)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably should be more consistent in our GKE job names. Some of the ones running from master are gke-ci, others are gke...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I think the manner done here is consistent with the GCE jobs, no suffix means it's running from master.

: ${E2E_CLUSTER_NAME:="jenkins-gke-e2e-serial"}
: ${E2E_NETWORK:="jenkins-gke-e2e-serial"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
\[Serial\] \
\[Disruptive\] \
\[Feature:Restart\] \
) --ginkgo.skip=$(join_regex_no_empty \
\[Flaky\]
)"}
: ${PROJECT:="kubernetes-jkns-e2e-gke-serial"}
;;

# Runs the performance/scalability tests on GCE. A larger cluster is used.
kubernetes-e2e-gce-scalability)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-scalability"}
Expand Down
18 changes: 18 additions & 0 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 @@ -189,3 +189,21 @@
description: 'Run E2E tests on GCE from the release-1.0 branch.'
jobs:
- 'kubernetes-e2e-{suffix}'

- project:
name: kubernetes-e2e-features
trigger-job: 'kubernetes-build'
branch: 'master'
suffix:
- 'gce-serial':
description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GCE using the latest successful build.'
timeout: 300
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
- 'gke-serial':
description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GKE using the latest successful build.'
timeout: 300
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
jobs:
- 'kubernetes-e2e-{suffix}'