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

Revert "[Discussion] Quarantine reboot tests as [Feature:Reboot] due to instability?" #20924

Merged
merged 1 commit into from
Feb 10, 2016
Merged

Revert "[Discussion] Quarantine reboot tests as [Feature:Reboot] due to instability?" #20924

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: 0 additions & 18 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,24 +403,6 @@ 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
18 changes: 4 additions & 14 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,23 +189,13 @@
timeout: 300
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
- 'gce-reboot':
description: 'Run [Feature:Reboot] tests on GCE using the latest successful build.'
timeout: 120
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
- 'gke-reboot':
description: 'Run [Feature:Reboot] tests on GKE using the latest successful build.'
timeout: 120
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
- 'gce-ingress':
description: 'Run [Feature:Ingress] tests on GCE using the latest successful build.'
- 'gke-ingress':
description: 'Run [Feature:Ingress] tests on GKE using the latest successful build.'
timeout: 90
emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
test-owner: 'beeps'
- 'gke-ingress':
description: 'Run [Feature:Ingress] tests on GKE using the latest successful build.'
- 'gce-ingress':
description: 'Run [Feature:Ingress] tests on GCE using the latest successful build.'
timeout: 90
emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
test-owner: 'beeps'
Expand Down
4 changes: 1 addition & 3 deletions test/e2e/reboot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ const (
rebootPodReadyAgainTimeout = 5 * time.Minute
)

// Reboot tests are flaky, and when they break, they break the whole cluster.
// They need to run in a separate suite until we can make them better.
var _ = Describe("Reboot [Disruptive] [Feature:Reboot]", func() {
var _ = Describe("Reboot [Disruptive]", func() {
var f *Framework

BeforeEach(func() {
Expand Down