Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark two kubectl tests flaky. #25147

Merged
merged 1 commit into from
May 4, 2016
Merged

Mark two kubectl tests flaky. #25147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/e2e/kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down