Merge pull request #20924 from kubernetes/revert-20651-quarantine-reboot

Auto commit by PR queue bot

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"}

hack/jenkins/job-configs/kubernetes-e2e.yaml

@@ -189,23 +189,13 @@
             timeout: 300
             emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
             test-owner: 'ihmccreery'
-        - 'gce-reboot':
+        - 'gke-ingress':
-            description: 'Run [Feature:Reboot] tests on GCE using the latest successful build.'
+            description: 'Run [Feature:Ingress] tests on GKE 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.'
             timeout: 90
             emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
             test-owner: 'beeps'
-        - 'gke-ingress':
+        - 'gce-ingress':
-            description: 'Run [Feature:Ingress] tests on GKE using the latest successful build.'
+            description: 'Run [Feature:Ingress] tests on GCE using the latest successful build.'
             timeout: 90
             emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
             test-owner: 'beeps'

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.
+var _ = Describe("Reboot [Disruptive]", func() {
-// They need to run in a separate suite until we can make them better.
-var _ = Describe("Reboot [Disruptive] [Feature:Reboot]", func() {
 	var f *Framework
 
 	BeforeEach(func() {