From 6ad95be52388665653b4e062634c025fe646fa33 Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@google.com>
Date: Thu, 11 Feb 2016 11:14:26 -0800
Subject: [PATCH] Quarantine reboot tests (again)

---
 hack/jenkins/e2e.sh                          | 18 ++++++++++++++++
 hack/jenkins/job-configs/kubernetes-e2e.yaml | 22 +++++++++++---------
 test/e2e/reboot.go                           |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 2a6a02b498a..0b78cf347fb 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -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"}
diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml
index 65c2dd6bb99..001e7c0faef 100644
--- a/hack/jenkins/job-configs/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml
@@ -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
@@ -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>
@@ -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
diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go
index 0ee03a778b6..a9d7958cbe1 100644
--- a/test/e2e/reboot.go
+++ b/test/e2e/reboot.go
@@ -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() {