From 112a28b48f6129481d113b96a830299c4c2f7d7c Mon Sep 17 00:00:00 2001 From: wojtekt Date: Fri, 6 Apr 2018 08:37:27 +0200 Subject: [PATCH] Fix resize nodes tests for Regional Clusters --- test/e2e/lifecycle/resize_nodes.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/e2e/lifecycle/resize_nodes.go b/test/e2e/lifecycle/resize_nodes.go index 8d9f41d5b63..50f7a9c9c67 100644 --- a/test/e2e/lifecycle/resize_nodes.go +++ b/test/e2e/lifecycle/resize_nodes.go @@ -119,10 +119,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { err = framework.VerifyPods(c, ns, name, true, replicas) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("decreasing cluster size to %d", replicas-1)) - err = framework.ResizeGroup(group, replicas-1) + targetNumNodes := int32(framework.TestContext.CloudConfig.NumNodes - 1) + By(fmt.Sprintf("decreasing cluster size to %d", targetNumNodes)) + err = framework.ResizeGroup(group, targetNumNodes) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForGroupSize(group, replicas-1) + err = framework.WaitForGroupSize(group, targetNumNodes) Expect(err).NotTo(HaveOccurred()) err = framework.WaitForReadyNodes(c, int(replicas-1), 10*time.Minute) Expect(err).NotTo(HaveOccurred()) @@ -149,10 +150,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { err = framework.VerifyPods(c, ns, name, true, replicas) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("increasing cluster size to %d", replicas+1)) - err = framework.ResizeGroup(group, replicas+1) + targetNumNodes := int32(framework.TestContext.CloudConfig.NumNodes + 1) + By(fmt.Sprintf("increasing cluster size to %d", targetNumNodes)) + err = framework.ResizeGroup(group, targetNumNodes) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForGroupSize(group, replicas+1) + err = framework.WaitForGroupSize(group, targetNumNodes) Expect(err).NotTo(HaveOccurred()) err = framework.WaitForReadyNodes(c, int(replicas+1), 10*time.Minute) Expect(err).NotTo(HaveOccurred())