github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2018-02-20 13:51:37 -08:00 committed by GitHub
parent 370540f90d efa63b7a58
commit 45131d7a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/root/.bazelrc
View File

@ -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 --jobs 4
test:integration --local_test_jobs 4
test:integration --test_tag_filters=integration

1
build/root/Makefile
View File

@ -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