github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-27 13:15:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25548 from jlowdermilk/lower-ginkgo-parallelism

Browse Source 
Automatic merge from submit-queue

Lower ginkgo parallelism and move same image rolling-update test out of flaky

Tentative fix for #25140.
This commit is contained in:
k8s-merge-robot
2016-05-22 18:43:57 -07:00
parent f58c587aaa 9dab67d106
commit 086ace44b8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/kubectl.go
View File

@@ -892,8 +892,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
framework.RunKubectlOrDie("delete", "rc", rcName, nsFlag)
})
// Flaky issue: #25140
It("should support rolling-update to same image [Conformance] [Flaky]", func() {
It("should support rolling-update to same image [Conformance]", func() {
By("running the image " + nginxImage)
framework.RunKubectlOrDie("run", rcName, "--image="+nginxImage, "--generator=run/v1", nsFlag)
By("verifying the rc " + rcName + " was created")