From ecc33fd8c2f8d8de8ac298222e5ac144f8b26d19 Mon Sep 17 00:00:00 2001 From: Maciej Pytel Date: Tue, 6 Jun 2017 01:44:36 +0200 Subject: [PATCH] Wait for instances boot in cluster-autoscaler e2e --- .../autoscaling/cluster_size_autoscaling.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index 50c65aaa45e..af2439aa055 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -79,14 +79,6 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() { c = f.ClientSet framework.SkipUnlessProviderIs("gce", "gke") - nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet) - nodeCount = len(nodes.Items) - Expect(nodeCount).NotTo(BeZero()) - cpu := nodes.Items[0].Status.Capacity[v1.ResourceCPU] - mem := nodes.Items[0].Status.Capacity[v1.ResourceMemory] - coresPerNode = int((&cpu).MilliValue() / 1000) - memCapacityMb = int((&mem).Value() / 1024 / 1024) - originalSizes = make(map[string]int) sum := 0 for _, mig := range strings.Split(framework.TestContext.CloudConfig.NodeInstanceGroup, ",") { @@ -96,6 +88,17 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() { originalSizes[mig] = size sum += size } + // Give instances time to spin up + framework.ExpectNoError(framework.WaitForClusterSize(c, sum, scaleUpTimeout)) + + nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet) + nodeCount = len(nodes.Items) + Expect(nodeCount).NotTo(BeZero()) + cpu := nodes.Items[0].Status.Capacity[v1.ResourceCPU] + mem := nodes.Items[0].Status.Capacity[v1.ResourceMemory] + coresPerNode = int((&cpu).MilliValue() / 1000) + memCapacityMb = int((&mem).Value() / 1024 / 1024) + Expect(nodeCount).Should(Equal(sum)) if framework.ProviderIs("gke") {