diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go index 9650f5e70a..f233133f66 100644 --- a/test/e2e/autoscaling.go +++ b/test/e2e/autoscaling.go @@ -29,6 +29,11 @@ import ( . "github.com/onsi/gomega" ) +const ( + scaleUpTimeout = 20 * time.Minute + scaleDownTimeout = 30 * time.Minute +) + var _ = Describe("Autoscaling", func() { f := NewFramework("autoscaling") var nodeCount int @@ -58,20 +63,20 @@ var _ = Describe("Autoscaling", func() { // Consume 50% CPU millicoresPerReplica := 500 rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f) - expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) rc.CleanUp() - expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) }) It("[Skipped] should scale cluster size based on cpu reservation", func() { setUpAutoscaler("cpu/node_reservation", 0.5, nodeCount, nodeCount+1) ReserveCpu(f, "cpu-reservation", 600*nodeCount*coresPerNode) - expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) expectNoError(DeleteRC(f.Client, f.Namespace.Name, "cpu-reservation")) - expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) }) It("[Skipped][Autoscaling Suite] should scale cluster size based on memory utilization", func() { @@ -80,20 +85,20 @@ var _ = Describe("Autoscaling", func() { // Consume 60% of total memory capacity megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode) rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f) - expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) rc.CleanUp() - expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) }) It("[Skipped] should scale cluster size based on memory reservation", func() { setUpAutoscaler("memory/node_reservation", 0.5, nodeCount, nodeCount+1) ReserveMemory(f, "memory-reservation", nodeCount*memCapacityMb*6/10) - expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout)) expectNoError(DeleteRC(f.Client, f.Namespace.Name, "memory-reservation")) - expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute)) + expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout)) }) })