Merge pull request #45243 from mikedanese/skip-integration

Automatic merge from submit-queue (batch tested with PRs 45120, 45243) skip integration test when run make bazel-test we should opt for a seperate target for integration tests. This is breaking @deads2k who is trying to add an integration test in staging.

Merge pull request #45243 from mikedanese/skip-integration
36590b06 · Kubernetes Submit Queue · GitHub · 46971d6d · 01b736c4 · 36590b06
Commit 36590b06 authored May 02, 2017 by Kubernetes Submit Queue Committed by GitHub May 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Makefile Makefile +1 -1

BUILD test/integration/federation/BUILD +4 -1

No files found.
--- a/Makefile
+++ b/Makefile
@@ -517,7 +517,7 @@ bazel-test:
 	@echo "$$BAZEL_TEST_HELP_INFO"
 else
 bazel-test:
-	bazel test --flaky_test_attempts=3 //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //hack/... //hack:verify-all //vendor/k8s.io/...
+	bazel test --test_tag_filters=-integration --flaky_test_attempts=3 //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //hack/... //hack:verify-all //vendor/k8s.io/...
 endif
 ifeq ($(PRINT_HELP),y)

--- a/test/integration/federation/BUILD
+++ b/test/integration/federation/BUILD
@@ -13,7 +13,10 @@ go_test(
        "api_test.go",
        "crud_test.go",
    ],
-    tags = ["automanaged"],
+    tags = [
+        "automanaged",
+        "integration",
+    ],
    deps = [
        "//federation/apis/federation/v1beta1:go_default_library",
        "//federation/pkg/federatedtypes:go_default_library",