github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15463 from piosz/enable-ir-e2e

Browse Source 
Enabled InitialResources e2e in autoscaling suite
This commit is contained in:
Jerzy Szczepkowski
2015-10-12 12:17:47 +02:00
parent 632e32d8f6 35cf8cc76c
commit e3c6750942
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-test.sh
View File

@@ -118,7 +118,7 @@ if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
ENABLE_EXPERIMENTAL_API=true ENABLE_EXPERIMENTAL_API=true
fi fi
ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota ADMISSION_CONTROL="${KUBE_ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota}"
# Optional: if set to true kube-up will automatically check for existing resources and clean them up. # Optional: if set to true kube-up will automatically check for existing resources and clean them up.
KUBE_UP_AUTOMATIC_CLEANUP=${KUBE_UP_AUTOMATIC_CLEANUP:-false} KUBE_UP_AUTOMATIC_CLEANUP=${KUBE_UP_AUTOMATIC_CLEANUP:-false}

3
hack/jenkins/e2e.sh
View File

@@ -228,6 +228,7 @@ case ${JOB_NAME} in
# Override GCE default for cluster size autoscaling purposes. # Override GCE default for cluster size autoscaling purposes.
ENABLE_CLUSTER_MONITORING="googleinfluxdb" ENABLE_CLUSTER_MONITORING="googleinfluxdb"
ENABLE_HORIZONTAL_POD_AUTOSCALER="true" ENABLE_HORIZONTAL_POD_AUTOSCALER="true"
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
;; ;;
# Runs the flaky tests on GCE, sequentially. # Runs the flaky tests on GCE, sequentially.
@@ -833,6 +834,8 @@ export NUM_MINIONS=${NUM_MINIONS:-}
export PROJECT=${PROJECT:-} export PROJECT=${PROJECT:-}
export JENKINS_PUBLISHED_VERSION=${JENKINS_PUBLISHED_VERSION:-'ci/latest'} export JENKINS_PUBLISHED_VERSION=${JENKINS_PUBLISHED_VERSION:-'ci/latest'}
export KUBE_ADMISSION_CONTROL=${ADMISSION_CONTROL:-}
export KUBERNETES_PROVIDER=${KUBERNETES_PROVIDER} export KUBERNETES_PROVIDER=${KUBERNETES_PROVIDER}
export PATH=${PATH}:/usr/local/go/bin export PATH=${PATH}:/usr/local/go/bin
export KUBE_SKIP_CONFIRMATIONS=y export KUBE_SKIP_CONFIRMATIONS=y

2
test/e2e/initial_resources.go
View File

@@ -28,7 +28,7 @@ import (
var _ = Describe("Initial Resources", func() { var _ = Describe("Initial Resources", func() {
f := NewFramework("initial-resources") f := NewFramework("initial-resources")
It("[Skipped] should set initial resources based on historical data", func() { It("[Skipped][Autoscaling Suite] should set initial resources based on historical data", func() {
cpu := 100 cpu := 100
mem := 200 mem := 200
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {