Merge pull request #29818 from Random-Liu/add-serial-jenkins-job

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() {

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

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

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

test/e2e_node/jenkins/jenkins-serial.properties

+GCE_HOSTS=
+GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
+GCE_ZONE=us-central1-f
+GCE_PROJECT=kubernetes-jenkins
+CLEANUP=true
+GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]"'
+SETUP_NODE=false
+TEST_ARGS=--cgroups-per-qos=true
+PARALLELISM=1