kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3922 from justinsb/bazel_fix_tests 

Automatic merge from submit-queue.

bazel: fix tests/ directory
This commit is contained in:
Kubernetes Submit Queue 2017-11-25 20:41:24 -08:00 committed by GitHub
parent 875b41627d b9ced1957b
commit 36abd6f418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -587,7 +587,7 @@ kops-server-push: kops-server-build
.PHONY: bazel-test .PHONY: bazel-test
bazel-test: bazel-test:
bazel ${BAZEL_OPTIONS} test //cmd/... //pkg/... //channels/... //nodeup/... //channels/... //protokube/... //dns-controller/... //upup/... //util/... //hack:verify-all --test_output=errors bazel ${BAZEL_OPTIONS} test //cmd/... //pkg/... //channels/... //nodeup/... //channels/... //protokube/... //dns-controller/... //tests/... //upup/... //util/... //hack:verify-all --test_output=errors
.PHONY: bazel-build .PHONY: bazel-build
bazel-build: bazel-build:

10
tests/integration/channel/BUILD.bazel
View File

@ -3,9 +3,19 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["integration_test.go"], srcs = ["integration_test.go"],
data = [
"exported_testdata", # keep
"//channels:channeldata", # keep
],
importpath = "k8s.io/kops/tests/integration/channel", importpath = "k8s.io/kops/tests/integration/channel",
deps = [ deps = [
"//pkg/apis/kops:go_default_library", "//pkg/apis/kops:go_default_library",
"//vendor/github.com/blang/semver:go_default_library", "//vendor/github.com/blang/semver:go_default_library",
], ],
) )
filegroup(
name = "exported_testdata",
srcs = glob(["simple/**"]),
visibility = ["//visibility:public"],
)

9
tests/integration/conversion/BUILD.bazel
View File

@ -3,6 +3,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["integration_test.go"], srcs = ["integration_test.go"],
data = [
"exported_testdata", # keep
],
importpath = "k8s.io/kops/tests/integration/conversion", importpath = "k8s.io/kops/tests/integration/conversion",
deps = [ deps = [
"//pkg/apis/kops:go_default_library", "//pkg/apis/kops:go_default_library",
@ -14,3 +17,9 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
], ],
) )
filegroup(
name = "exported_testdata",
srcs = glob(["minimal/**"]),
visibility = ["//visibility:public"],
)