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

Quarantine reboot tests (again) #21090

Merged
merged 1 commit into from
Feb 11, 2016
Merged

Quarantine reboot tests (again) #21090

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
18 changes: 18 additions & 0 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,24 @@ case ${JOB_NAME} in

# Feature jobs

# Runs only the reboot tests on GCE.
kubernetes-e2e-gce-reboot)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"}
: ${E2E_NETWORK:="e2e-reboot"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Reboot\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"}
: ${PROJECT:="kubernetes-jenkins"}
;;

kubernetes-e2e-gke-reboot)
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"}
: ${E2E_NETWORK:="e2e-gke-ci-reboot"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Reboot\]"}
;;

# Runs only the examples tests on GCE.
kubernetes-e2e-gce-examples)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-examples"}
Expand Down
22 changes: 12 additions & 10 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 @@ -42,6 +42,12 @@
- 'gce-slow':
description: 'Run slow E2E tests on GCE using the latest successful build.'
timeout: 60
- 'gce-serial':
description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GCE using the latest successful build.'
timeout: 300
- 'gce-reboot':
description: 'Run [Feature:Reboot] tests on GCE using the latest successful build.'
timeout: 180
- 'gce-autoscaling':
description: 'Run autoscaling E2E tests on GCE using the latest successful build.'
timeout: 210
Expand Down Expand Up @@ -76,6 +82,12 @@
- 'gke-slow':
description: 'Run slow E2E tests on GKE using the latest successful build.'
timeout: 60
- 'gke-serial':
description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GKE using the latest successful build.'
timeout: 300
- 'gke-reboot':
description: 'Run [Feature:Reboot] tests on GKE using the latest successful build.'
timeout: 180
- 'gke-flaky':
description: |
Run flaky e2e tests using the following config:<br>
Expand Down Expand Up @@ -179,16 +191,6 @@
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'
- 'gke-ingress':
description: 'Run [Feature:Ingress] tests on GKE using the latest successful build.'
timeout: 90
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/reboot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const (
rebootPodReadyAgainTimeout = 5 * time.Minute
)

var _ = Describe("Reboot [Disruptive]", func() {
var _ = Describe("Reboot [Disruptive] [Feature:Reboot]", func() {
var f *Framework

BeforeEach(func() {
Expand Down