github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26811 from vishh/26809 

Automatic merge from submit-queue

Mark runtime conformance tests as flaky and not run them in jenkins CI.

For #26809

@pwittrock As discussed offline, marking runtime tests as flaky for now. I'm not sure if those tests are required. Testing docker in every Kubernetes PR is un-necessary. 
These tests can be run periodically in a separate CI. AFAIK, these tests don't seem to exercise any kube features.
pull/6/head
k8s-merge-robot 2016-06-06 11:14:44 -07:00
parent 3acf04dded 4e3bce8cb7
commit 015bc3d60d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e_node/image_conformance_test.go
View File

@ -41,7 +41,7 @@ var _ = Describe("Image Container Conformance Test", func() {
cl = client.NewOrDie(&restclient.Config{Host: *apiServerAddress}) 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() { Context("when testing images that exist", func() {
var conformImages []ConformanceImage var conformImages []ConformanceImage
BeforeEach(func() { 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 { for _, conformImage := range conformImages {
present, err := conformImage.Present() present, err := conformImage.Present()
Expect(err).ShouldNot(HaveOccurred()) 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", "") image, _ := NewConformanceImage("docker", "")
tags, err := image.List() tags, err := image.List()
Expect(err).ShouldNot(HaveOccurred()) Expect(err).ShouldNot(HaveOccurred())
@ -101,7 +101,7 @@ var _ = Describe("Image Container Conformance Test", func() {
conformImages = append(conformImages, conformImage) conformImages = append(conformImages, conformImage)
} }
By("not presenting images [Conformance]", func() { By("not presenting images", func() {
for _, conformImage := range conformImages { for _, conformImage := range conformImages {
present, err := conformImage.Present() present, err := conformImage.Present()
Expect(err).ShouldNot(HaveOccurred()) 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", "") image, _ := NewConformanceImage("docker", "")
tags, err := image.List() tags, err := image.List()
Expect(err).ShouldNot(HaveOccurred()) 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 { for _, conformImage := range conformImages {
err := conformImage.Remove() err := conformImage.Remove()
Expect(err).Should(HaveOccurred()) Expect(err).Should(HaveOccurred())

2
test/e2e_node/jenkins/jenkins-ci.properties
View File

@ -8,6 +8,6 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins GCE_PROJECT=kubernetes-jenkins
GCE_IMAGE_PROJECT=kubernetes-jenkins GCE_IMAGE_PROJECT=kubernetes-jenkins
CLEANUP=true CLEANUP=true
GINKGO_FLAGS= GINKGO_FLAGS=--ginkgo.skip=FLAKY
SETUP_NODE=false SETUP_NODE=false

2
test/e2e_node/jenkins/jenkins-pull.properties
View File

@ -8,5 +8,5 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins-pull GCE_PROJECT=kubernetes-jenkins-pull
GCE_IMAGE_PROJECT=kubernetes-jenkins-pull GCE_IMAGE_PROJECT=kubernetes-jenkins-pull
CLEANUP=true CLEANUP=true
GINKGO_FLAGS= GINKGO_FLAGS=--ginkgo.skip=FLAKY
SETUP_NODE=false SETUP_NODE=false

2
test/e2e_node/runtime_conformance_test.go
View File

@ -47,7 +47,7 @@ type testStatus struct {
Ready bool Ready bool
} }
var _ = Describe("Container runtime Conformance Test", func() { var _ = Describe("[FLAKY] Container runtime Conformance Test", func() {
var cl *client.Client var cl *client.Client
BeforeEach(func() { BeforeEach(func() {