From 0c75dd22f8a9cb460ae17748b275728fca6f8384 Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Mon, 10 Jul 2017 22:41:52 +0200
Subject: [PATCH] Move performance tests to test/e2e/scalability subdirectory

---
 test/e2e/BUILD                            | 6 ++----
 test/e2e/e2e_test.go                      | 2 +-
 test/e2e/{perf => scalability}/BUILD      | 1 +
 test/e2e/{perf => scalability}/OWNERS     | 4 +++-
 test/e2e/{perf => scalability}/density.go | 2 +-
 test/e2e/{ => scalability}/empty.go       | 5 ++---
 test/e2e/{perf => scalability}/load.go    | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename test/e2e/{perf => scalability}/BUILD (99%)
 rename test/e2e/{perf => scalability}/OWNERS (77%)
 rename test/e2e/{perf => scalability}/density.go (99%)
 rename test/e2e/{ => scalability}/empty.go (85%)
 rename test/e2e/{perf => scalability}/load.go (99%)

diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 740a8038877..55a79f54368 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -25,7 +25,7 @@ go_test(
         "//test/e2e/extension:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/metrics:go_default_library",
-        "//test/e2e/perf:go_default_library",
+        "//test/e2e/scalability:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/e2e/storage:go_default_library",
         "//test/e2e/workload:go_default_library",
@@ -58,7 +58,6 @@ go_library(
         "dns_common.go",
         "dns_configmap.go",
         "e2e.go",
-        "empty.go",
         "empty_dir_wrapper.go",
         "etcd_failure.go",
         "events.go",
@@ -140,7 +139,6 @@ go_library(
         "//test/e2e/generated:go_default_library",
         "//test/e2e/manifest:go_default_library",
         "//test/e2e/metrics:go_default_library",
-        "//test/e2e/perf:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/e2e/upgrades:go_default_library",
         "//test/e2e/workload:go_default_library",
@@ -229,8 +227,8 @@ filegroup(
         "//test/e2e/generated:all-srcs",
         "//test/e2e/manifest:all-srcs",
         "//test/e2e/metrics:all-srcs",
-        "//test/e2e/perf:all-srcs",
         "//test/e2e/perftype:all-srcs",
+        "//test/e2e/scalability:all-srcs",
         "//test/e2e/scheduling:all-srcs",
         "//test/e2e/storage:all-srcs",
         "//test/e2e/testing-manifests:all-srcs",
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index d5058816e08..8f19a3700ff 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -24,7 +24,7 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/cluster-logging"
 	_ "k8s.io/kubernetes/test/e2e/extension"
 	"k8s.io/kubernetes/test/e2e/framework"
-	_ "k8s.io/kubernetes/test/e2e/perf"
+	_ "k8s.io/kubernetes/test/e2e/scalability"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"
 	_ "k8s.io/kubernetes/test/e2e/storage"
 	_ "k8s.io/kubernetes/test/e2e/workload"
diff --git a/test/e2e/perf/BUILD b/test/e2e/scalability/BUILD
similarity index 99%
rename from test/e2e/perf/BUILD
rename to test/e2e/scalability/BUILD
index a89c652978e..0b55d73d85c 100644
--- a/test/e2e/perf/BUILD
+++ b/test/e2e/scalability/BUILD
@@ -11,6 +11,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "density.go",
+        "empty.go",
         "load.go",
     ],
     tags = ["automanaged"],
diff --git a/test/e2e/perf/OWNERS b/test/e2e/scalability/OWNERS
similarity index 77%
rename from test/e2e/perf/OWNERS
rename to test/e2e/scalability/OWNERS
index b6fb0a98d7d..80e945f3982 100644
--- a/test/e2e/perf/OWNERS
+++ b/test/e2e/scalability/OWNERS
@@ -1,7 +1,9 @@
 approvers:
 - gmarek
+- shyamjvs
 - wojtek-t
 reviewers:
 - gmarek
-- wojtek-t
+- shyamjvs
 - timothysc
+- wojtek-t
diff --git a/test/e2e/perf/density.go b/test/e2e/scalability/density.go
similarity index 99%
rename from test/e2e/perf/density.go
rename to test/e2e/scalability/density.go
index dad05c7e01e..6084c49bf1a 100644
--- a/test/e2e/perf/density.go
+++ b/test/e2e/scalability/density.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package perf
+package scalability
 
 import (
 	"fmt"
diff --git a/test/e2e/empty.go b/test/e2e/scalability/empty.go
similarity index 85%
rename from test/e2e/empty.go
rename to test/e2e/scalability/empty.go
index 5296c9ed76e..05b11044832 100644
--- a/test/e2e/empty.go
+++ b/test/e2e/scalability/empty.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package scalability
 
 import (
 	"time"
@@ -22,7 +22,6 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/test/e2e/framework"
-	"k8s.io/kubernetes/test/e2e/perf"
 
 	. "github.com/onsi/ginkgo"
 )
@@ -43,7 +42,7 @@ var _ = framework.KubeDescribe("Empty [Feature:Empty]", func() {
 	})
 
 	It("starts a pod", func() {
-		configs, _, _ := perf.GenerateConfigsForGroup([]*v1.Namespace{f.Namespace}, "empty-pod", 1, 1, framework.GetPauseImageName(f.ClientSet), []string{}, api.Kind("ReplicationController"), 0, 0)
+		configs, _, _ := GenerateConfigsForGroup([]*v1.Namespace{f.Namespace}, "empty-pod", 1, 1, framework.GetPauseImageName(f.ClientSet), []string{}, api.Kind("ReplicationController"), 0, 0)
 		if len(configs) != 1 {
 			framework.Failf("generateConfigs should have generated single config")
 		}
diff --git a/test/e2e/perf/load.go b/test/e2e/scalability/load.go
similarity index 99%
rename from test/e2e/perf/load.go
rename to test/e2e/scalability/load.go
index 6c3c4e21977..1248e4ee0ac 100644
--- a/test/e2e/perf/load.go
+++ b/test/e2e/scalability/load.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package perf
+package scalability
 
 import (
 	"fmt"