github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17367 from piosz/deployment-e2e

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-17 03:10:02 -08:00
parent 539a629f4b d246e7833b
commit cae1f4095a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/e2e.sh
View File

@@ -286,6 +286,7 @@ case ${JOB_NAME} in
: ${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"}
: ${ENABLE_DEPLOYMENTS:=true}
# Override GCE default for cluster size autoscaling purposes. # Override GCE default for cluster size autoscaling purposes.
ENABLE_CLUSTER_MONITORING="googleinfluxdb" ENABLE_CLUSTER_MONITORING="googleinfluxdb"
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"

4
test/e2e/horizontal_pod_autoscaling.go
View File

@@ -42,10 +42,10 @@ var _ = Describe("Horizontal pod autoscaling", func() {
titleDown := "%s should scale from 5 pods to 3 pods and from 3 to 1 (via %s, with scale resource: CPU)" titleDown := "%s should scale from 5 pods to 3 pods and from 3 to 1 (via %s, with scale resource: CPU)"
// CPU tests via deployments // CPU tests via deployments
It(fmt.Sprintf(titleUp, "[Skipped]", kindDeployment), func() { It(fmt.Sprintf(titleUp, "[Autoscaling Suite]", kindDeployment), func() {
scaleUp("deployment", kindDeployment, rc, f) scaleUp("deployment", kindDeployment, rc, f)
}) })
It(fmt.Sprintf(titleDown, "[Skipped]", kindDeployment), func() { It(fmt.Sprintf(titleDown, "[Autoscaling Suite]", kindDeployment), func() {
scaleDown("deployment", kindDeployment, rc, f) scaleDown("deployment", kindDeployment, rc, f)
}) })