Merge pull request #25147 from spxtr/flaky

Mark two kubectl tests flaky.
This commit is contained in:
Dawn Chen 2016-05-04 16:21:08 -07:00
commit 2083582270

View File

@ -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")