diff --git a/build/BUILD b/build/BUILD index d325d73336..96c7d34c30 100644 --- a/build/BUILD +++ b/build/BUILD @@ -148,6 +148,7 @@ filegroup( "//cmd/kubemark", # TODO: server platforms only "//cmd/linkcheck", "//test/e2e:e2e.test", + "//test/e2e_kubeadm:e2e_kubeadm.test", # TODO: server platforms only "//test/e2e_node:e2e_node.test", # TODO: server platforms only "//vendor/github.com/onsi/ginkgo/ginkgo", ], diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index 54feeea8ea..8495e27c72 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -57,6 +57,7 @@ kube::test::find_dirs() { -o -path './target/*' \ -o -path './test/e2e/*' \ -o -path './test/e2e_node/*' \ + -o -path './test/e2e_kubeadm/*' \ -o -path './test/integration/*' \ -o -path './third_party/*' \ -o -path './staging/*' \ diff --git a/test/BUILD b/test/BUILD index d8087c512e..f55d259350 100644 --- a/test/BUILD +++ b/test/BUILD @@ -13,6 +13,7 @@ filegroup( ":package-srcs", "//test/conformance:all-srcs", "//test/e2e:all-srcs", + "//test/e2e_kubeadm:all-srcs", "//test/e2e_node:all-srcs", "//test/fixtures:all-srcs", "//test/images:all-srcs", diff --git a/test/e2e_kubeadm/BUILD b/test/e2e_kubeadm/BUILD new file mode 100644 index 0000000000..afa04ca59d --- /dev/null +++ b/test/e2e_kubeadm/BUILD @@ -0,0 +1,62 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_test( + name = "go_default_test", + srcs = [ + "e2e_kubeadm_suite_test.go", + "kubeadm_test.go", + ], + embed = [":go_default_library"], + deps = [ + "//test/e2e/framework:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/rbac/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/rest:go_default_library", + "//vendor/k8s.io/client-go/tools/bootstrap/token/api:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +genrule( + name = "gen_e2e_kubeadm.test", + testonly = 1, + srcs = [":go_default_test"], + outs = ["e2e_kubeadm.test"], + cmd = "srcs=($(SRCS)); cp $$(dirname $${srcs[0]})/go_default_test $@;", + output_to_bindir = 1, +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//test/e2e_kubeadm/runner/local:all-srcs", + "//test/e2e_kubeadm/tests:all-srcs", + ], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) + +go_library( + name = "go_default_library", + srcs = ["matchers.go"], + importpath = "k8s.io/kubernetes/test/e2e_kubeadm", + visibility = ["//visibility:public"], + deps = [ + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/github.com/onsi/gomega/gstruct:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + ], +) diff --git a/test/e2e_kubeadm/runner/local/BUILD b/test/e2e_kubeadm/runner/local/BUILD new file mode 100644 index 0000000000..412adbe48e --- /dev/null +++ b/test/e2e_kubeadm/runner/local/BUILD @@ -0,0 +1,32 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") + +go_library( + name = "go_default_library", + srcs = ["run_local.go"], + importpath = "k8s.io/kubernetes/test/e2e_kubeadm/runner/local", + visibility = ["//visibility:private"], + deps = [ + "//test/utils:go_default_library", + "//vendor/github.com/golang/glog:go_default_library", + ], +) + +go_binary( + name = "local", + embed = [":go_default_library"], + visibility = ["//visibility:public"], +) + +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/e2e_kubeadm/tests/BUILD b/test/e2e_kubeadm/tests/BUILD new file mode 100644 index 0000000000..6df04e38cd --- /dev/null +++ b/test/e2e_kubeadm/tests/BUILD @@ -0,0 +1,13 @@ +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +)