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

Merge pull request #20274 from ihmccreery/autoscaling-feature

Browse Source 
Move HPA e2es into the default slow suite, and add [Feature:ClusterSizeAutoscaling] and [Feature:InitialResources]
This commit is contained in:
Fabio Yeon 2016-01-29 09:39:33 -08:00
commit 1dc6e88a0d
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/jenkins/e2e.sh
View File

@ -352,7 +352,8 @@ case ${JOB_NAME} in
kubernetes-e2e-gce-autoscaling)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"}
: ${E2E_NETWORK:="e2e-autoscaling"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Autoscaling\]"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:ClusterSizeAutoscaling\]|\[Feature:InitialResources\] \
--ginkgo.skip=\[Flaky\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-autoscaling"}
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}

7
test/e2e/cluster_size_autoscaling.go
View File

@ -32,7 +32,12 @@ const (
scaleDownTimeout = 30 * time.Minute
)
var _ = Describe("Autoscaling [Skipped]", func() {
// [Feature:ClusterSizeAutoscaling]: Cluster size autoscaling is experimental
// and require Google Cloud Monitoring to be enabled, so these tests are not
// run by default.
//
// These tests take ~20 minutes to run each.
var _ = Describe("Cluster size autoscaling [Feature:ClusterSizeAutoscaling] [Slow]", func() {
f := NewFramework("autoscaling")
var nodeCount int
var coresPerNode int

3
test/e2e/horizontal_pod_autoscaling.go
View File

@ -31,7 +31,8 @@ const (
subresource = "scale"
)
var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Feature:Autoscaling]", func() {
// These tests take ~20 minutes each.
var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Slow]", func() {
var rc *ResourceConsumer
f := NewFramework("horizontal-pod-autoscaling")

6
test/e2e/initial_resources.go
View File

@ -26,7 +26,11 @@ import (
"k8s.io/kubernetes/pkg/api"
)
var _ = Describe("Initial Resources [Skipped] ", func() {
// [Feature:InitialResources]: Initial resources is an experimental feature, so
// these tests are not run by default.
//
// Flaky issue #20272
var _ = Describe("Initial Resources [Feature:InitialResources] [Flaky]", func() {
f := NewFramework("initial-resources")
It("should set initial resources based on historical data", func() {