Merge pull request #60090 from mikedanese/bzl2

Automatic merge from submit-queue (batch tested with PRs 59391, 58097, 60057, 60090). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. bzl: use --local_test_jobs We originally seperated build and test so that only 4 integration tests would be run at a time, but we didn't want to slow down build, however we didn't know --local_test_jobs existed. This achieves the same result but more efficiently. ```release-note NONE ```

Merge pull request #60090 from mikedanese/bzl2
45131d7a · Kubernetes Submit Queue · GitHub · 370540f9 · efa63b7a · 45131d7a
Unverified Commit 45131d7a authored Feb 20, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

.bazelrc build/root/.bazelrc +1 -2

Makefile build/root/Makefile +0 -1

No files found.
--- a/build/root/.bazelrc
+++ b/build/root/.bazelrc
@@ -19,6 +19,5 @@ test:unit --features=race
 test:unit --test_tag_filters=-e2e,-integration
 test:unit --flaky_test_attempts=3
-build:integration --build_tag_filters=integration
+test:integration --local_test_jobs 4
-test:integration --jobs 4
 test:integration --test_tag_filters=integration
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -562,7 +562,6 @@ bazel-test-integration:
 	@echo "$$BAZEL_TEST_INTEGRATION_HELP_INFO"
 else
 bazel-test-integration:
-	bazel build --config integration //test/integration/...
 	bazel test --config integration //test/integration/...
 endif