diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-10-25 21:09:17 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-10-25 21:11:48 +0200 |
| commit | 008775c416e1b91d29bdb1efbbec7fbf30087c74 (patch) | |
| tree | 3e4ae19690401eedcd652d4d26782794405e9354 | |
| parent | d24af715e1827784146bf027600a2695bf5c3acf (diff) | |
stop using deprecated bazel_wrapper.py
| -rwxr-xr-x | tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh | 8 | ||||
| -rw-r--r-- | tools/remote_build/kokoro.bazelrc | 19 |
2 files changed, 21 insertions, 6 deletions
diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh index 768e15b380..4ad806c303 100755 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh @@ -21,23 +21,21 @@ set -ex mkdir -p ${KOKORO_KEYSTORE_DIR} cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service +# Get latest release of bazel +# TODO(jtattermusch): replace by open-source installation of bazel temp_dir=$(mktemp -d) ln -f "${KOKORO_GFILE_DIR}/bazel-latest-release" ${temp_dir}/bazel chmod 755 "${KOKORO_GFILE_DIR}/bazel-latest-release" export PATH="${temp_dir}:${PATH}" # This should show ${temp_dir}/bazel which bazel -chmod +x "${KOKORO_GFILE_DIR}/bazel_wrapper.py" # change to grpc repo root cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_rc -export KOKORO_FOUNDRY_PROJECT_ID="projects/grpc-testing/instances/default_instance" - -# TODO(adelez): implement size for test targets and change test_timeout back -"${KOKORO_GFILE_DIR}/bazel_wrapper.py" \ +bazel \ --bazelrc=tools/remote_build/kokoro.bazelrc \ test \ $@ \ diff --git a/tools/remote_build/kokoro.bazelrc b/tools/remote_build/kokoro.bazelrc index 0aacddf663..b06fb83d11 100644 --- a/tools/remote_build/kokoro.bazelrc +++ b/tools/remote_build/kokoro.bazelrc @@ -16,8 +16,25 @@ import %workspace%/tools/remote_build/rbe_common.bazelrc +build --remote_cache=remotebuildexecution.googleapis.com +build --remote_executor=remotebuildexecution.googleapis.com +build --tls_enabled=true + +build --auth_enabled=true +# magic location where kokoro script puts the credentials +build --auth_credentials=/tmpfs/src/keystore/4321_grpc-testing-service +build --auth_scope=https://www.googleapis.com/auth/cloud-source-tools + +build --bes_backend=buildeventservice.googleapis.com +build --bes_best_effort=false +build --bes_timeout=600s +build --project_id=grpc-testing + +# required by kokoro for some reason +build --test_env=USER=anon + build --jobs=200 build --test_output=errors -build --keep_going +build --keep_going=true build --remote_accept_cached=true build --remote_local_fallback=true |