Cleanup configuration of bazel RBE jobs (#29301)

* cleanup bazel_rbe .cfg and .sh files

* upload sponge_log.xml artifacts for selected bazel jobs

* use move_src_tree_and_respawn_itself_rc for bazel RBE tests on linux

* fix wrong config

tools/internal_ci/linux/grpc_asan_on_foundry.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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_dbg.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-export UPLOAD_TEST_RESULTS=true
-EXTRA_FLAGS="--config=dbg --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

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-export UPLOAD_TEST_RESULTS=true
-EXTRA_FLAGS="--config=opt --cache_test_results=no"
-github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/grpc_bazel_rbe.sh

@@ -15,6 +15,9 @@
 
 set -ex
 
+# avoid slow finalization after the script has exited.
+source $(dirname $0)/../../../tools/internal_ci/helper_scripts/move_src_tree_and_respawn_itself_rc
+
 # change to grpc repo root
 cd $(dirname $0)/../../..
 
@@ -28,5 +31,6 @@ python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_
 bazel_rbe/bazel_wrapper \
   --bazelrc=tools/remote_build/linux_kokoro.bazelrc \
   test \
+  $BAZEL_FLAGS \
   "$@" \
   -- //test/...

tools/internal_ci/linux/grpc_bazel_rbe_asan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_asan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,14 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=asan"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/linux/grpc_bazel_rbe_dbg.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,14 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=dbg"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.cfg

@@ -17,6 +17,12 @@
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 

tools/internal_ci/linux/grpc_bazel_rbe_incompatible_changes.sh

@@ -24,5 +24,4 @@ export USE_BAZEL_VERSION=latest
 # Use bazelisk instead of our usual //tools/bazel wrapper
 mv bazelisk-linux-amd64 github/grpc/tools/bazel
 
-EXTRA_FLAGS="--config=opt --cache_test_results=no"
-github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"
+github/grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh --config=opt --cache_test_results=no

tools/internal_ci/linux/grpc_bazel_rbe_msan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_msan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,15 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=msan"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}
+

tools/internal_ci/linux/grpc_bazel_rbe_opt.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -26,4 +32,15 @@ bazel_setting {
   # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
-}
+}
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=opt"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/linux/grpc_bazel_rbe_tsan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_tsan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,14 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=tsan"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/linux/grpc_bazel_rbe_ubsan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_ubsan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,14 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--cache_test_results=no --config=ubsan"
+}
+
+env_vars {
+  key: "UPLOAD_TEST_RESULTS"
+  value: "true"
+}

tools/internal_ci/linux/grpc_msan_on_foundry.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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=msan --cache_test_results=no

tools/internal_ci/linux/grpc_python_bazel_test.cfg

@@ -17,6 +17,13 @@
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/linux/grpc_bazel.sh"
 timeout_mins: 240
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
+
 env_vars {
   key: "BAZEL_SCRIPT"
   value: "tools/internal_ci/linux/grpc_python_bazel_test_in_docker.sh"

tools/internal_ci/linux/grpc_tsan_on_foundry.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-EXTRA_FLAGS="--config=dbg"
-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

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-EXTRA_FLAGS="--config=opt"
-github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_asan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_asan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,9 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=asan"
+}

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_dbg.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_dbg.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -26,4 +32,10 @@ bazel_setting {
   # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
-}
+}
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=dbg"
+}

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_msan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_msan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,9 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=msan"
+}

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_opt.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_bazel_on_foundry_opt.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -26,4 +32,10 @@ bazel_setting {
   # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
-}
+}
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=opt"
+}

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_tsan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_tsan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,9 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=tsan"
+}

tools/internal_ci/linux/pull_request/grpc_bazel_rbe_ubsan.cfg

@@ -15,8 +15,14 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/pull_request/grpc_ubsan_on_foundry.sh"
+build_file: "grpc/tools/internal_ci/linux/grpc_bazel_rbe.sh"
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
 
@@ -27,3 +33,9 @@ bazel_setting {
   # command is invoked).
   upsalite_frontend_address: "https://source.cloud.google.com"
 }
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=ubsan"
+}

tools/internal_ci/linux/pull_request/grpc_msan_on_foundry.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2018 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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=msan

tools/internal_ci/linux/pull_request/grpc_tsan_on_foundry.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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/internal_ci/windows/grpc_bazel_rbe_dbg.cfg

@@ -16,8 +16,13 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
-
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"

tools/internal_ci/windows/grpc_bazel_rbe_opt.cfg

@@ -16,8 +16,13 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
-
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"

tools/internal_ci/windows/pull_request/grpc_bazel_rbe_dbg.cfg

@@ -16,8 +16,13 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
-
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"

tools/internal_ci/windows/pull_request/grpc_bazel_rbe_opt.cfg

@@ -16,8 +16,13 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/windows/bazel_rbe.bat"
-
 timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
 
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
 gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"