stop using deprecated bazel_wrapper.py

pull/17009/head
Jan Tattermusch 6 years ago
parent d24af715e1
commit 008775c416
  1. 8
      tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
  2. 19
      tools/remote_build/kokoro.bazelrc

@ -21,23 +21,21 @@ set -ex
mkdir -p ${KOKORO_KEYSTORE_DIR} mkdir -p ${KOKORO_KEYSTORE_DIR}
cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service 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) temp_dir=$(mktemp -d)
ln -f "${KOKORO_GFILE_DIR}/bazel-latest-release" ${temp_dir}/bazel ln -f "${KOKORO_GFILE_DIR}/bazel-latest-release" ${temp_dir}/bazel
chmod 755 "${KOKORO_GFILE_DIR}/bazel-latest-release" chmod 755 "${KOKORO_GFILE_DIR}/bazel-latest-release"
export PATH="${temp_dir}:${PATH}" export PATH="${temp_dir}:${PATH}"
# This should show ${temp_dir}/bazel # This should show ${temp_dir}/bazel
which bazel which bazel
chmod +x "${KOKORO_GFILE_DIR}/bazel_wrapper.py"
# change to grpc repo root # change to grpc repo root
cd $(dirname $0)/../../.. cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_rc source tools/internal_ci/helper_scripts/prepare_build_linux_rc
export KOKORO_FOUNDRY_PROJECT_ID="projects/grpc-testing/instances/default_instance" bazel \
# TODO(adelez): implement size for test targets and change test_timeout back
"${KOKORO_GFILE_DIR}/bazel_wrapper.py" \
--bazelrc=tools/remote_build/kokoro.bazelrc \ --bazelrc=tools/remote_build/kokoro.bazelrc \
test \ test \
$@ \ $@ \

@ -16,8 +16,25 @@
import %workspace%/tools/remote_build/rbe_common.bazelrc 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 --jobs=200
build --test_output=errors build --test_output=errors
build --keep_going build --keep_going=true
build --remote_accept_cached=true build --remote_accept_cached=true
build --remote_local_fallback=true build --remote_local_fallback=true

Loading…
Cancel
Save