From d0ab1f06fb8fdbddbac28b55eb1a7f4a1abfb844 Mon Sep 17 00:00:00 2001
From: John Schnake <jschnake@vmware.com>
Date: Thu, 12 Sep 2019 14:31:37 -0500
Subject: [PATCH] Allow disruptive conformance tests and marks 2

 - Adjusts tooling to allow disrutpive tests to be marked conformance
 - Updates the corresponding tests
 - Marks 2 tests as disruptive
---
 test/conformance/walk.go      |  2 +-
 test/conformance/walk_test.go | 14 +++++---------
 test/e2e/scheduling/taints.go |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/conformance/walk.go b/test/conformance/walk.go
index db5a9f4e99a..dc2bcfd714f 100644
--- a/test/conformance/walk.go
+++ b/test/conformance/walk.go
@@ -44,7 +44,7 @@ var (
 	totalConfTests, totalLegacyTests, missingComments int
 
 	// If a test name contains any of these tags, it is ineligble for promotion to conformance
-	regexIneligibleTags = regexp.MustCompile(`\[(Alpha|Disruptive|Feature:[^\]]+|Flaky)\]`)
+	regexIneligibleTags = regexp.MustCompile(`\[(Alpha|Feature:[^\]]+|Flaky)\]`)
 )
 
 const regexDescribe = "Describe|KubeDescribe|SIGDescribe"
diff --git a/test/conformance/walk_test.go b/test/conformance/walk_test.go
index c18c3301adb..68b39e8e919 100644
--- a/test/conformance/walk_test.go
+++ b/test/conformance/walk_test.go
@@ -156,17 +156,13 @@ func TestValidateTestName(t *testing.T) {
 			"",
 		},
 		{
-			"a test case with valid tags [LinuxOnly] [NodeConformance] [Serial]",
+			"a test case with valid tags [LinuxOnly] [NodeConformance] [Serial] [Disruptive]",
 			"",
 		},
 		{
 			"a flaky test case that is invalid [Flaky]",
 			"[Flaky]",
 		},
-		{
-			"a disruptive test case that is invalid [Disruptive]",
-			"[Disruptive]",
-		},
 		{
 			"a feature test case that is invalid [Feature:Awesome]",
 			"[Feature:Awesome]",
@@ -176,12 +172,12 @@ func TestValidateTestName(t *testing.T) {
 			"[Alpha]",
 		},
 		{
-			"a test case with multiple invalid tags [Flaky][Disruptive] [Feature:Awesome] [Alpha]",
-			"[Flaky],[Disruptive],[Feature:Awesome],[Alpha]",
+			"a test case with multiple invalid tags [Flaky] [Feature:Awesome] [Alpha]",
+			"[Flaky],[Feature:Awesome],[Alpha]",
 		},
 		{
-			"[sig-awesome] [Disruptive] a test case with valid and invalid tags [Alpha] [Serial] [Flaky]",
-			"[Disruptive],[Alpha],[Flaky]",
+			"[sig-awesome] [Alpha] [Disruptive] a test case with valid and invalid tags [Serial] [Flaky]",
+			"[Alpha],[Flaky]",
 		},
 	}
 	for i, tc := range testCases {
diff --git a/test/e2e/scheduling/taints.go b/test/e2e/scheduling/taints.go
index 93e8f93ec5e..f2850a295af 100644
--- a/test/e2e/scheduling/taints.go
+++ b/test/e2e/scheduling/taints.go
@@ -283,7 +283,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
 		Description: The Pod with toleration timeout scheduled on a tainted Node MUST not be
 		evicted if the taint is removed before toleration time ends.
 	*/
-	framework.ConformanceIt("removing taint cancels eviction", func() {
+	framework.ConformanceIt("removing taint cancels eviction [Disruptive]", func() {
 		podName := "taint-eviction-4"
 		pod := createPodForTaintsTest(true, 2*additionalWaitPerDeleteSeconds, podName, podName, ns)
 		observedDeletions := make(chan string, 100)
@@ -413,7 +413,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
 		Description: In a multi-pods scenario with tolerationSeconds, the pods MUST be evicted as per
 		the toleration time limit.
 	*/
-	framework.ConformanceIt("evicts pods with minTolerationSeconds", func() {
+	framework.ConformanceIt("evicts pods with minTolerationSeconds [Disruptive]", func() {
 		podGroup := "taint-eviction-b"
 		observedDeletions := make(chan string, 100)
 		stopCh := make(chan struct{})