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

Merge pull request #19543 from ihmccreery/autoscaling-skips

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-15 06:10:59 -08:00
commit 68a6147454
3 changed files with 3 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

@ -290,7 +290,6 @@ GKE_REQUIRED_SKIP_TESTS=(
# Specialized tests which should be skipped by default for GKE. # Specialized tests which should be skipped by default for GKE.
GKE_DEFAULT_SKIP_TESTS=( GKE_DEFAULT_SKIP_TESTS=(
"Autoscaling\sSuite"
# Perf test, slow by design # Perf test, slow by design
"resource\susage\stracking" "resource\susage\stracking"
"${GKE_REQUIRED_SKIP_TESTS[@]}" "${GKE_REQUIRED_SKIP_TESTS[@]}"
@ -390,7 +389,7 @@ case ${JOB_NAME} in
kubernetes-e2e-gce-autoscaling) kubernetes-e2e-gce-autoscaling)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"}
: ${E2E_NETWORK:="e2e-autoscaling"} : ${E2E_NETWORK:="e2e-autoscaling"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Autoscaling\]"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Autoscaling\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-autoscaling"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-autoscaling"}
: ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"} : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}

2
test/e2e/cluster_size_autoscaling.go
View File

@ -32,7 +32,7 @@ const (
scaleDownTimeout = 30 * time.Minute scaleDownTimeout = 30 * time.Minute
) )
var _ = Describe("[Autoscaling] [Skipped]", func() { var _ = Describe("Autoscaling [Feature:Autoscaling]", func() {
f := NewFramework("autoscaling") f := NewFramework("autoscaling")
var nodeCount int var nodeCount int
var coresPerNode int var coresPerNode int

2
test/e2e/horizontal_pod_autoscaling.go
View File

@ -48,7 +48,7 @@ var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Skipped]", f
}) })
}) })
Describe("[Autoscaling] ReplicationController", func() { Describe("ReplicationController [Feature:Autoscaling]", func() {
// CPU tests via replication controllers // CPU tests via replication controllers
It(titleUp, func() { It(titleUp, func() {
scaleUp("rc", kindRC, rc, f) scaleUp("rc", kindRC, rc, f)