diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2019-04-05 15:47:36 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-04-05 15:48:32 -0700 |
| commit | f44f2f73b068658ddf632586e2178e372fcd1cbd (patch) | |
| tree | 14ab34a7d7c64cc779dd0732fde171cff6ab026e /kokoro | |
| parent | 252f877f3d0ccc3f1aeb7de0e13d71fb3d4e7284 (diff) | |
Make it easier for humans to use RBE, and maintain our bazelrc.
This CL merges all RBE-specific configuration from .bazelrc_rbe into .bazelrc
so that it will be picked up by default by users running bazel.
It also checks in a bazelrc from the upstream bazel-toolchains repository, and
imports that into our repo-specific .bazelrc. This makes it easier to maintain
and update the bazelrc going forward.
Documentation was added to the README.
PiperOrigin-RevId: 242208733
Change-Id: Iea32de9be85b024bd74f88909b56b2a8ab34851a
Diffstat (limited to 'kokoro')
| -rwxr-xr-x | kokoro/run_tests.sh | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index c52bdfc1b..4769fc7a0 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -47,11 +47,6 @@ bazel version # Load the kvm module sudo -n -E modprobe kvm -# Bazel start-up flags for RBE. -BAZEL_RBE_FLAGS=( - "--bazelrc=${WORKSPACE_DIR}/.bazelrc_rbe" -) - # General Bazel build/test flags. BAZEL_BUILD_FLAGS=( "--show_timestamps" @@ -77,9 +72,7 @@ build_everything() { FLAVOR="${1}" cd ${WORKSPACE_DIR} - bazel \ - "${BAZEL_RBE_FLAGS[@]}" \ - build \ + bazel build \ -c "${FLAVOR}" "${BAZEL_BUILD_RBE_FLAGS[@]}" \ "${BUILD_PACKAGES[@]}" } @@ -88,8 +81,7 @@ build_everything() { # configuration. run_simple_tests() { cd ${WORKSPACE_DIR} - bazel \ - test \ + bazel test \ "${BAZEL_BUILD_FLAGS[@]}" \ "${TEST_PACKAGES[@]}" } @@ -178,9 +170,7 @@ run_root_tests() { # Run syscall unit tests. run_syscall_tests() { cd ${WORKSPACE_DIR} - bazel \ - "${BAZEL_RBE_FLAGS[@]}" \ - test "${BAZEL_BUILD_RBE_FLAGS[@]}" \ + bazel test "${BAZEL_BUILD_RBE_FLAGS[@]}" \ --test_tag_filters=runsc_ptrace //test/syscalls/... } |