diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-12-06 08:57:45 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-12-06 08:57:45 +0100 |
| commit | 3a0fde868e966100e2b8b26f48b1719c995c4c5a (patch) | |
| tree | 592e11c91a0dc7bce6248313a9e94d8978b75bb8 /tools | |
| parent | 58745066550ad84e30d04e2c27678f7ba38b73c4 (diff) | |
| parent | daa1ffb855bffe65be25ec2cebddf89c7ee883a0 (diff) | |
Merge pull request #17374 from jtattermusch/foundry_deprecated_nits
Address a few "deprecated" warnings on foundry
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh | 13 | ||||
| -rw-r--r-- | tools/remote_build/kokoro.bazelrc | 1 |
2 files changed, 7 insertions, 7 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 74778d9d29..d35bbbd275 100755 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh @@ -15,8 +15,8 @@ set -ex -# A temporary solution to give Kokoro credentials. -# The file name 4321_grpc-testing-service needs to match auth_credential in +# A temporary solution to give Kokoro credentials. +# The file name 4321_grpc-testing-service needs to match auth_credential in # the build config. mkdir -p ${KOKORO_KEYSTORE_DIR} cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service @@ -35,14 +35,15 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_rc # to get "bazel" link for kokoro build, we need to generate -# invocation UUID, set an env var for bazel to pick it up -# and upload "bazel_invocation_ids" file as artifact. -export BAZEL_INTERNAL_INVOCATION_ID="$(uuidgen)" -echo "${BAZEL_INTERNAL_INVOCATION_ID}" >"${KOKORO_ARTIFACTS_DIR}/bazel_invocation_ids" +# invocation UUID, set a flag for bazel to use it +# and upload "bazel_invocation_ids" file as artifact. +BAZEL_INVOCATION_ID="$(uuidgen)" +echo "${BAZEL_INVOCATION_ID}" >"${KOKORO_ARTIFACTS_DIR}/bazel_invocation_ids" bazel \ --bazelrc=tools/remote_build/kokoro.bazelrc \ test \ + --invocation_id="${BAZEL_INVOCATION_ID}" \ $@ \ -- //test/... || FAILED="true" diff --git a/tools/remote_build/kokoro.bazelrc b/tools/remote_build/kokoro.bazelrc index 11462bd301..2fbdd3ce02 100644 --- a/tools/remote_build/kokoro.bazelrc +++ b/tools/remote_build/kokoro.bazelrc @@ -26,7 +26,6 @@ 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 |