From 81bb39c3c096c906ec627e74eed60f4f11f92cac Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Wed, 4 May 2016 10:19:05 -0700 Subject: [PATCH] Mark two kubectl tests flaky. --- test/e2e/kubectl.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 3fe811357bd..c1344fb1a30 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -614,7 +614,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() { }) framework.KubeDescribe("Kubectl describe", func() { - It("should check if kubectl describe prints relevant information for rc and pods [Conformance]", func() { + // Flaky issue: #25083 + It("should check if kubectl describe prints relevant information for rc and pods [Conformance] [Flaky]", func() { framework.SkipUnlessServerVersionGTE(nodePortsOptionalVersion, c) mkpath := func(file string) string { @@ -1040,7 +1041,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() { framework.RunKubectlOrDie("delete", "rc", rcName, nsFlag) }) - It("should support rolling-update to same image [Conformance]", func() { + // Flaky issue: #25140 + It("should support rolling-update to same image [Conformance] [Flaky]", func() { By("running the image " + nginxImage) framework.RunKubectlOrDie("run", rcName, "--image="+nginxImage, "--generator=run/v1", nsFlag) By("verifying the rc " + rcName + " was created")