github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53584 from aleksandra-malinowska/autoscaling-test-fix-11

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Avoid unnecessary gcloud call if test was skipped

This adds a safeguard to AfterEach to avoid attempting to resize node group with empty name when the test was skipped.

```
1009 04:06:31.866] [BeforeEach] [sig-autoscaling] Autoscaling a service
I1009 04:06:31.866]   /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/autoscaling/autoscaling_timer.go:42
I1009 04:06:31.869] [BeforeEach] from 1 pod and 3 nodes to 8 pods and >=4 nodes
I1009 04:06:31.869]   /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/autoscaling/autoscaling_timer.go:68
I1009 04:06:31.869] Oct  9 04:06:31.869: INFO: test expects 1 node group, found 2
I1009 04:06:31.870] [AfterEach] from 1 pod and 3 nodes to 8 pods and >=4 nodes
I1009 04:06:31.870]   /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/autoscaling/autoscaling_timer.go:74
I1009 04:06:31.870] Oct  9 04:06:31.869: INFO: Skipping dumping logs from cluster
I1009 04:06:32.510] Oct  9 04:06:32.509: INFO: Failed to resize node instance group: ERROR: (gcloud.compute.instance-groups.managed.resize) could not parse resource []
I1009 04:06:32.510] 
I1009 04:06:32.510] Oct  9 04:06:32.509: INFO: Skipping dumping logs from cluster
I1009 04:06:32.510] Oct  9 04:06:32.509: INFO: Unexpected error occurred: exit status 1
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-09 03:36:06 -07:00 committed by GitHub
commit 846ba01925
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/autoscaling/autoscaling_timer.go
View File

@ -68,9 +68,13 @@ var _ = SIGDescribe("[Feature:ClusterSizeAutoscalingScaleUp] [Slow] Autoscaling"
})
AfterEach(func() {
// Scale down back to only 'nodesNum' nodes, as expected at the start of the test.
framework.ExpectNoError(framework.ResizeGroup(nodeGroupName, nodesNum))
framework.ExpectNoError(framework.WaitForReadyNodes(f.ClientSet, nodesNum, 15*time.Minute))
// Attempt cleanup only if a node group was targeted for scale up.
// Otherwise the test was probably skipped and we'll get a gcloud error due to invalid parameters.
if len(nodeGroupName) > 0 {
// Scale down back to only 'nodesNum' nodes, as expected at the start of the test.
framework.ExpectNoError(framework.ResizeGroup(nodeGroupName, nodesNum))
framework.ExpectNoError(framework.WaitForReadyNodes(f.ClientSet, nodesNum, 15*time.Minute))
}
})
Measure("takes less than 15 minutes", func(b Benchmarker) {