From 843b913b079fec9b96305e66265d8d49f02e231b Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@google.com>
Date: Thu, 28 Jan 2016 14:44:22 -0800
Subject: [PATCH] Reclassify Restart tests as [Disruptive] and skip
 [Feature:.+] tests in -serial jobs

---
 hack/jenkins/e2e.sh | 8 ++++----
 test/e2e/restart.go | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 0af96b13ae2..3e5f5840b16 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -511,8 +511,8 @@ case ${JOB_NAME} in
     : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-serial"}
     : ${E2E_NETWORK:="jenkins-gce-e2e-serial"}
     : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
-    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \
-                           --ginkgo.skip=\[Flaky\]"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
+                           --ginkgo.skip=\[Flaky\]|\[Feature:.+\]"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"}
     : ${PROJECT:="kubernetes-jkns-e2e-gce-serial"}
     ;;
@@ -523,8 +523,8 @@ case ${JOB_NAME} in
     : ${E2E_NETWORK:="jenkins-gke-e2e-serial"}
     : ${E2E_SET_CLUSTER_API_VERSION:=y}
     : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
-    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \
-                           --ginkgo.skip=\[Flaky\]"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
+                           --ginkgo.skip=\[Flaky\]|\[Feature:.+\]"}
     : ${PROJECT:="jenkins-gke-e2e-serial"}
     ;;
 
diff --git a/test/e2e/restart.go b/test/e2e/restart.go
index 7d0aefd03d3..d5e7ecbfbd4 100644
--- a/test/e2e/restart.go
+++ b/test/e2e/restart.go
@@ -48,9 +48,7 @@ const (
 	restartPodReadyAgainTimeout = 5 * time.Minute
 )
 
-// TODO(ihmccreery): These tests haven't been run for a while, so until they're
-// known stable, consider them a non-core feature.
-var _ = Describe("Restart [Feature:Restart]", func() {
+var _ = Describe("Restart [Disruptive]", func() {
 	var c *client.Client
 	var ps *podStore
 	var skipped bool