From 2ad245b8a8eacfd581c4dee68b451c43c51b0cd2 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Tue, 9 Feb 2016 12:25:03 -0800 Subject: [PATCH] Revert "[Discussion] Quarantine reboot tests as [Feature:Reboot] due to instability?" --- hack/jenkins/e2e.sh | 18 ------------------ hack/jenkins/job-configs/kubernetes-e2e.yaml | 18 ++++-------------- test/e2e/reboot.go | 4 +--- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 6c146c0347c..e5b347c77a9 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -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"} diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 9e88fa98085..24da978e091 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -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' diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index 23dd5e7de0a..0ee03a778b6 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -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() {