From a6f5dddc4f1a3a1e84667a478f5ee5ae66f67ff2 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Thu, 5 Jul 2018 09:04:56 -0400
Subject: [PATCH] move test-cmd guts to separate sig-cli maintained directory

---
 hack/make-rules/BUILD                         | 10 +----
 hack/make-rules/test-cmd.sh                   |  2 +-
 test/BUILD                                    |  1 +
 test/cmd/BUILD                                | 40 +++++++++++++++++++
 test/cmd/OWNERS                               |  4 ++
 .../cmd/legacy-script.sh                      |  0
 6 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 test/cmd/BUILD
 create mode 100644 test/cmd/OWNERS
 rename hack/make-rules/test-cmd-util.sh => test/cmd/legacy-script.sh (100%)

diff --git a/hack/make-rules/BUILD b/hack/make-rules/BUILD
index 2ff9bb3bfa..ee15dba5f7 100644
--- a/hack/make-rules/BUILD
+++ b/hack/make-rules/BUILD
@@ -20,8 +20,8 @@ sh_binary(
     name = "test-cmd",
     srcs = ["test-cmd.sh"],
     deps = [
-        ":test-cmd-util",
         "//hack/lib",
+        "//test/cmd:all-srcs",
     ],
 )
 
@@ -89,14 +89,6 @@ sh_binary(
     ],
 )
 
-sh_library(
-    name = "test-cmd-util",
-    srcs = [
-        "test-cmd-util.sh",
-    ],
-    data = ["//pkg/kubectl/validation:testdata/v1/validPod.yaml"],
-)
-
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),
diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh
index a4b4ef33b0..e5763dc232 100755
--- a/hack/make-rules/test-cmd.sh
+++ b/hack/make-rules/test-cmd.sh
@@ -24,7 +24,7 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 source "${KUBE_ROOT}/hack/lib/test.sh"
-source "${KUBE_ROOT}/hack/make-rules/test-cmd-util.sh"
+source "${KUBE_ROOT}/test/cmd/legacy-script.sh"
 
 function run_kube_apiserver() {
   kube::log::status "Building kube-apiserver"
diff --git a/test/BUILD b/test/BUILD
index f55d259350..bf386c790c 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -11,6 +11,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
+        "//test/cmd:all-srcs",
         "//test/conformance:all-srcs",
         "//test/e2e:all-srcs",
         "//test/e2e_kubeadm:all-srcs",
diff --git a/test/cmd/BUILD b/test/cmd/BUILD
new file mode 100644
index 0000000000..330c533634
--- /dev/null
+++ b/test/cmd/BUILD
@@ -0,0 +1,40 @@
+# Scripts runnable from make, e.g.
+#
+#    cd $GOPATH/src/k8s.io/kubernetes
+#    make test-e2e-node
+#
+# The sh_binary rules below exist only to validate
+# dependencies; if a shell dependency is accidentally
+# deleted, a presubmit BUILD will fail.
+#
+# If the scripts sourced their dependencies from
+# $RUNFILES (rather than $BASH_SOURCE/../.. or
+# whatever), then bazel build hack/...  would install
+# runnable, hermetically sealed shell "binaries".
+# E.g. the following command would work:
+#
+#   ./bazel-bin/hack/make-rules/test-e2e-node
+#
+# TODO(#47064): Should be a sh_test instead of sh_binary
+
+sh_library(
+    name = "legacy-script",
+    srcs = [
+        "legacy-script.sh",
+    ],
+    data = ["//pkg/kubectl/validation:testdata/v1/validPod.yaml"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
diff --git a/test/cmd/OWNERS b/test/cmd/OWNERS
new file mode 100644
index 0000000000..ce699e9679
--- /dev/null
+++ b/test/cmd/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- sig-cli-maintainers
+reviewers:
+- sig-cli
diff --git a/hack/make-rules/test-cmd-util.sh b/test/cmd/legacy-script.sh
similarity index 100%
rename from hack/make-rules/test-cmd-util.sh
rename to test/cmd/legacy-script.sh