From ea192ddb284fd36fe36f81787355c1a88206f489 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 18 Nov 2016 11:22:10 -0800 Subject: [PATCH 1/2] revert revert of test/e2e/generated/BUILD broken in fad1990eaaaf6f602815a9a92026048abc186135 --- test/e2e/generated/BUILD | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/test/e2e/generated/BUILD b/test/e2e/generated/BUILD index 895dd683fbd..a82f3efa2c1 100644 --- a/test/e2e/generated/BUILD +++ b/test/e2e/generated/BUILD @@ -13,8 +13,28 @@ load( go_library( name = "go_default_library", srcs = [ - "bindata.go", "main.go", + ":bindata", + ], +) + +genrule( + name = "bindata", + srcs = [ + "//examples:sources", + "//test/images:sources", + "//test/fixtures:sources", + "//test/e2e/testing-manifests:sources", + ], + outs = ["bindata.go"], + cmd = """ +$(location //vendor:github.com/jteeuwen/go-bindata/go-bindata) \ + -nometadata -o "$(OUTS)" -pkg generated \ + -prefix $$(pwd) \ + -ignore .jpg -ignore .png -ignore .md \ + $(SRCS) +""", + tools = [ + "//vendor:github.com/jteeuwen/go-bindata/go-bindata", ], - tags = ["automanaged"], ) From bfb8902e44ef7fdeb176500a2d8e06a35d40c04d Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 18 Nov 2016 13:09:30 -0800 Subject: [PATCH 2/2] fix test/e2e/ compilation --- test/e2e/BUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 4ccfd780b7c..a5b4a7f4d6f 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -210,7 +210,10 @@ go_library( ], ) -go_test( +# this is a private library until we can support building the +# test binary +# TODO(mikedanese): fix @io_bazelbuild/rules_go +go_library( name = "go_default_test", srcs = [ "e2e_test.go", @@ -218,6 +221,7 @@ go_test( ], library = "go_default_library", tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library",