Merge pull request #17009 from jtattermusch/eradicate_bazel_wrapper

Stop using deprecated bazel_wrapper.py

tools/internal_ci/linux/grpc_asan_on_foundry.sh

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 export UPLOAD_TEST_RESULTS=true
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=asan --cache_test_results=no
 

tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh

@@ -21,23 +21,27 @@ 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"
+# 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"
 
-# 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 \
   $@ \

tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 export UPLOAD_TEST_RESULTS=true
 EXTRA_FLAGS="-c dbg --test_timeout=300,450,1200,3600 --cache_test_results=no"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 export UPLOAD_TEST_RESULTS=true
 EXTRA_FLAGS="-c opt --test_timeout=300,450,1200,3600 --cache_test_results=no"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/grpc_tsan_on_foundry.sh

@@ -13,5 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 export UPLOAD_TEST_RESULTS=true
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=tsan --cache_test_results=no

tools/internal_ci/linux/grpc_ubsan_on_foundry.sh

@@ -13,5 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 export UPLOAD_TEST_RESULTS=true
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=ubsan --cache_test_results=no

tools/internal_ci/linux/pull_request/grpc_asan_on_foundry.sh

@@ -13,5 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=asan
 

tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_dbg.sh

@@ -13,5 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 EXTRA_FLAGS="-c dbg --test_timeout=300,450,1200,3600"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_opt.sh

@@ -13,5 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 EXTRA_FLAGS="-c opt --test_timeout=300,450,1200,3600"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/pull_request/grpc_tsan_on_foundry.sh

@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=tsan

tools/internal_ci/linux/pull_request/grpc_ubsan_on_foundry.sh

@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh --config=ubsan

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

tools/run_tests/python_utils/upload_rbe_results.py

@@ -62,7 +62,7 @@ def _get_invocation_id():
     bazel_id_directory = os.getenv('KOKORO_ARTIFACTS_DIR')
     bazel_id_file = os.path.join(bazel_id_directory, 'bazel_invocation_ids')
     assert os.path.isfile(bazel_id_file), 'bazel_invocation_ids file, written ' \
-     'by bazel_wrapper.py, expected but not found.'
+     'by RBE initialization script, expected but not found.'
     with open(bazel_id_file, 'r') as f:
         return f.read().replace('\n', '')