Merge pull request #6803 from wojtek-t/separate_density_and_scalability

hack/jenkins/e2e.sh

@@ -40,7 +40,7 @@ fi
 # Additional parameters that are passed to ginkgo runner.
 GINKGO_TEST_ARGS=""
 
-if [[ "${SCALABILITY:-}" == "true" ]]; then
+if [[ "${PERFORMANCE:-}" == "true" ]]; then
     if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
       export MASTER_SIZE="m3.xlarge"
     else
@@ -49,7 +49,7 @@ if [[ "${SCALABILITY:-}" == "true" ]]; then
     # TODO(wojtek-t): Once we have enough quota for the project, increase
     # NUM_MINIONS to 100 (which is our v1.0 goal).
     export NUM_MINIONS="10"
-    GINKGO_TEST_ARGS="--ginkgo.focus=Density "
+    GINKGO_TEST_ARGS="--ginkgo.focus=\[Performance suite\] "
 else
     if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
       export MASTER_SIZE="t2.small"

test/e2e/density.go

@@ -228,6 +228,9 @@ var _ = Describe("Density", func() {
 
 	for _, testArg := range densityTests {
 		name := fmt.Sprintf("should allow starting %d pods per node", testArg.podsPerMinion)
+		if testArg.podsPerMinion <= 30 {
+			name = "[Performance suite] " + name
+		}
 		if testArg.skip {
 			name = "[Skipped] " + name
 		}