Merge pull request kubernetes#13193 from piosz/autoscaling-e2e

Started running Autoscaling e2e test on dedicated Jenkins job
nikhiljindal · Aug 26, 2015 · b87077c · b87077c
2 parents dee21c8 + 99b9de9
commit b87077c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -88,6 +88,7 @@ fi
 
 # Specialized tests which should be skipped by default for projects.
 GCE_DEFAULT_SKIP_TESTS=(
+    "Autoscaling\sSuite"
     "Skipped"
     "Reboot"
     "Restart"
@@ -97,15 +98,13 @@ GCE_DEFAULT_SKIP_TESTS=(
 # The following tests are known to be flaky, and are thus run only in their own
 # -flaky- build variants.
 GCE_FLAKY_TESTS=(
-    "Autoscaling"
     "DaemonRestart"
     "ResourceUsage"
     )
 
 # Tests which are not able to be run in parallel.
 GCE_PARALLEL_SKIP_TESTS=(
     ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}}
-    "Autoscaling"
     "Etcd"
     "NetworkingNew"
     "Nodes\sNetwork"
@@ -132,7 +131,6 @@ GCE_PARALLEL_FLAKY_TESTS=(
 
 # Tests that should not run on soak cluster.
 GCE_SOAK_CONTINUOUS_SKIP_TESTS=(
-    "Autoscaling"
     "Density.*30\spods"
     "Elasticsearch"
     "Etcd.*SIGKILL"
@@ -148,7 +146,6 @@ GCE_SOAK_CONTINUOUS_SKIP_TESTS=(
     )
 
 GCE_RELEASE_SKIP_TESTS=(
-    "Autoscaling"
     )
 
 # Define environment variables based on the Jenkins project name.
@@ -164,8 +161,6 @@ case ${JOB_NAME} in
           )"}
     : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
     : ${PROJECT:="k8s-jkns-e2e-gce"}
-    # Override GCE default for cluster size autoscaling purposes.
-    ENABLE_CLUSTER_MONITORING="googleinfluxdb"
     ;;
 
   # Runs only the examples tests on GCE.
@@ -178,6 +173,18 @@ case ${JOB_NAME} in
     : ${PROJECT:="kubernetes-jenkins"}
     ;;
 
+  # Runs only the autoscaling tests on GCE.
+  kubernetes-e2e-gce-autoscaling)
+    : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"}
+    : ${E2E_DOWN:="false"}
+    : ${E2E_NETWORK:="e2e-autoscaling"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Autoscaling\sSuite"}
+    : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-autoscaling"}
+    : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
+    # Override GCE default for cluster size autoscaling purposes.
+    ENABLE_CLUSTER_MONITORING="googleinfluxdb"
+    ;;
+
   # Runs the flaky tests on GCE, sequentially.
   kubernetes-e2e-gce-flaky)
     : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-flaky"}
@@ -190,8 +197,6 @@ case ${JOB_NAME} in
           )"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-flaky"}
     : ${PROJECT:="k8s-jkns-e2e-gce-flaky"}
-    # Override GCE default for cluster size autoscaling purposes.
-    ENABLE_CLUSTER_MONITORING="googleinfluxdb"
     ;;
 
   # Runs all non-flaky tests on GCE in parallel.

diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go
@@ -53,7 +53,7 @@ var _ = Describe("Autoscaling", func() {
 		cleanUpAutoscaler()
 	})
 
-	It("[Autoscaling] should scale cluster size based on cpu utilization", func() {
+	It("[Skipped][Autoscaling Suite] should scale cluster size based on cpu utilization", func() {
 		setUpAutoscaler("cpu/node_utilization", 0.7, nodeCount, nodeCount+1)
 
 		ConsumeCpu(f, "cpu-utilization", nodeCount*coresPerNode)
@@ -73,7 +73,7 @@ var _ = Describe("Autoscaling", func() {
 		expectNoError(waitForClusterSize(f.Client, 1, 20*time.Minute))
 	})
 
-	It("[Autoscaling] should scale cluster size based on memory utilization", func() {
+	It("[Skipped][Autoscaling Suite] should scale cluster size based on memory utilization", func() {
 		setUpAutoscaler("memory/node_utilization", 0.5, nodeCount, nodeCount+1)
 
 		// Consume 60% of total memory capacity in 256MB chunks.