From e93346def4ca378107b44b3d405bde0732a26dd4 Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Thu, 12 May 2016 14:12:37 -0700 Subject: [PATCH 1/2] Lower ginkgo nodes to avoid resource contention in parallel tests --- hack/ginkgo-e2e.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index 4246b73f006..c0d96ac6c63 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -30,6 +30,12 @@ e2e_test=$(kube::util::find-binary "e2e.test") GINKGO_PARALLEL=${GINKGO_PARALLEL:-n} # set to 'y' to run tests in parallel +# The number of tests that can run in parallel depends on what tests +# are running and on the size of the cluster. Too many, and tests will +# fail due to resource contention. 25 is a reasonable default for a +# 3-node (n1-standard-1) cluster running all fast, non-disruptive tests. +GINKGO_PARALLELISM=${GINKGO_PARALLELISM:-25} + : ${KUBECTL:="${KUBE_ROOT}/cluster/kubectl.sh"} : ${KUBE_CONFIG_FILE:="config-test.sh"} @@ -78,7 +84,7 @@ fi if [[ -n "${GINKGO_PARALLEL_NODES:-}" ]]; then ginkgo_args+=("--nodes=${GINKGO_PARALLEL_NODES}") elif [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then - ginkgo_args+=("--nodes=30") # By default, set --nodes=30. + ginkgo_args+=("--nodes=25") fi # The --host setting is used only when providing --auth_config From 9dab67d106ce8751619fb5c711982a9b666e2b5a Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Thu, 12 May 2016 14:15:12 -0700 Subject: [PATCH 2/2] move same image rolling-update test out of Flaky --- test/e2e/kubectl.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 8a246012e71..675acccdbfe 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -1053,8 +1053,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")