From 654d3a07cbfd5fc025874f512e6c23d51910b655 Mon Sep 17 00:00:00 2001
From: Random Liu <lantaol@google.com>
Date: Tue, 2 Aug 2016 02:13:50 +0000
Subject: [PATCH] Skip Flaky, Slow and Serial test in proper jenkins job.

---
 test/e2e_node/image_conformance_test.go                    | 2 +-
 test/e2e_node/jenkins/jenkins-ci.properties                | 2 +-
 test/e2e_node/jenkins/jenkins-docker-validation.properties | 3 ++-
 test/e2e_node/jenkins/jenkins-pull.properties              | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/e2e_node/image_conformance_test.go b/test/e2e_node/image_conformance_test.go
index 17708ec0a66..a5811df2a24 100644
--- a/test/e2e_node/image_conformance_test.go
+++ b/test/e2e_node/image_conformance_test.go
@@ -31,7 +31,7 @@ const (
 )
 
 var _ = Describe("Image Container Conformance Test", func() {
-	Describe("[FLAKY] image conformance blackbox test", func() {
+	Describe("[Flaky] image conformance blackbox test", func() {
 		Context("when testing images that exist", func() {
 			var conformImages []ConformanceImage
 			BeforeEach(func() {
diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties
index 3b090984422..c38e85c68a1 100644
--- a/test/e2e_node/jenkins/jenkins-ci.properties
+++ b/test/e2e_node/jenkins/jenkins-ci.properties
@@ -3,6 +3,6 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
 GCE_ZONE=us-central1-f
 GCE_PROJECT=kubernetes-jenkins
 CLEANUP=true
-GINKGO_FLAGS=--skip=FLAKY
+GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
 SETUP_NODE=false
 TEST_ARGS=--cgroups-per-qos=true
diff --git a/test/e2e_node/jenkins/jenkins-docker-validation.properties b/test/e2e_node/jenkins/jenkins-docker-validation.properties
index 0f7b499a523..fec18ceb150 100644
--- a/test/e2e_node/jenkins/jenkins-docker-validation.properties
+++ b/test/e2e_node/jenkins/jenkins-docker-validation.properties
@@ -13,5 +13,6 @@ GCE_PROJECT=kubernetes-jenkins
 # gci-docker-version specifies docker version in GCI image.
 GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}"
 CLEANUP=true
-GINKGO_FLAGS=--skip=FLAKY
+# TODO(random-liu): Run performance test in docker validation test.
+GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
 SETUP_NODE=true
diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties
index 62333ffe3c4..f7be56a1abb 100644
--- a/test/e2e_node/jenkins/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/jenkins-pull.properties
@@ -3,6 +3,6 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
 GCE_ZONE=us-central1-f
 GCE_PROJECT=kubernetes-jenkins-pull
 CLEANUP=true
-GINKGO_FLAGS=--skip=FLAKY
+GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]"'
 SETUP_NODE=false
 TEST_ARGS=--cgroups-per-qos=true