From 4e3bce8cb75cf4a60f733837b550437f6ef8bd69 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Fri, 3 Jun 2016 13:57:44 -0700 Subject: [PATCH] Mark runtime conformance tests as flaky and not run them in jenkins CI. Signed-off-by: Vishnu kannan --- test/e2e_node/image_conformance_test.go | 12 ++++++------ test/e2e_node/jenkins/jenkins-ci.properties | 2 +- test/e2e_node/jenkins/jenkins-pull.properties | 2 +- test/e2e_node/runtime_conformance_test.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/e2e_node/image_conformance_test.go b/test/e2e_node/image_conformance_test.go index 02023bd3f6..4875695ad6 100644 --- a/test/e2e_node/image_conformance_test.go +++ b/test/e2e_node/image_conformance_test.go @@ -41,7 +41,7 @@ var _ = Describe("Image Container Conformance Test", func() { cl = client.NewOrDie(&restclient.Config{Host: *apiServerAddress}) }) - Describe("image conformance blackbox test", func() { + Describe("[FLAKY] image conformance blackbox test", func() { Context("when testing images that exist", func() { var conformImages []ConformanceImage BeforeEach(func() { @@ -59,7 +59,7 @@ var _ = Describe("Image Container Conformance Test", func() { } }) - It("It should present successfully [Conformance]", func() { + It("It should present successfully", func() { for _, conformImage := range conformImages { present, err := conformImage.Present() Expect(err).ShouldNot(HaveOccurred()) @@ -67,7 +67,7 @@ var _ = Describe("Image Container Conformance Test", func() { } }) - It("should list pulled images [Conformance]", func() { + It("should list pulled images", func() { image, _ := NewConformanceImage("docker", "") tags, err := image.List() Expect(err).ShouldNot(HaveOccurred()) @@ -101,7 +101,7 @@ var _ = Describe("Image Container Conformance Test", func() { conformImages = append(conformImages, conformImage) } - By("not presenting images [Conformance]", func() { + By("not presenting images", func() { for _, conformImage := range conformImages { present, err := conformImage.Present() Expect(err).ShouldNot(HaveOccurred()) @@ -109,7 +109,7 @@ var _ = Describe("Image Container Conformance Test", func() { } }) - By("not listing pulled images [Conformance]", func() { + By("not listing pulled images", func() { image, _ := NewConformanceImage("docker", "") tags, err := image.List() Expect(err).ShouldNot(HaveOccurred()) @@ -118,7 +118,7 @@ var _ = Describe("Image Container Conformance Test", func() { } }) - By("not removing non-exist images [Conformance]", func() { + By("not removing non-exist images", func() { for _, conformImage := range conformImages { err := conformImage.Remove() Expect(err).Should(HaveOccurred()) diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties index 03ce988d9c..2b0fb59290 100644 --- a/test/e2e_node/jenkins/jenkins-ci.properties +++ b/test/e2e_node/jenkins/jenkins-ci.properties @@ -9,6 +9,6 @@ GCE_PROJECT=kubernetes-jenkins GCE_IMAGE_PROJECT=kubernetes-jenkins INSTALL_GODEP=true CLEANUP=true -GINKGO_FLAGS= +GINKGO_FLAGS=--ginkgo.skip=FLAKY SETUP_NODE=false diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties index 027a69d3fb..09868fe5ca 100644 --- a/test/e2e_node/jenkins/jenkins-pull.properties +++ b/test/e2e_node/jenkins/jenkins-pull.properties @@ -9,5 +9,5 @@ GCE_PROJECT=kubernetes-jenkins-pull GCE_IMAGE_PROJECT=kubernetes-jenkins-pull INSTALL_GODEP=true CLEANUP=true -GINKGO_FLAGS= +GINKGO_FLAGS=--ginkgo.skip=FLAKY SETUP_NODE=false \ No newline at end of file diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go index 66c35e468b..762d78aa40 100644 --- a/test/e2e_node/runtime_conformance_test.go +++ b/test/e2e_node/runtime_conformance_test.go @@ -47,7 +47,7 @@ type testStatus struct { Ready bool } -var _ = Describe("Container runtime Conformance Test", func() { +var _ = Describe("[FLAKY] Container runtime Conformance Test", func() { var cl *client.Client BeforeEach(func() {