From 810a93e783bb3bb8a3f736fefd46793241100481 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 21 Dec 2018 10:55:20 +0100
Subject: [PATCH] inject extra details to Bazel RBE links

---
 .../linux/grpc_bazel_on_foundry_base.sh       |  1 +
 tools/remote_build/workspace_status_kokoro.sh | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100755 tools/remote_build/workspace_status_kokoro.sh

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 d35bbbd2756..4d7d4271d61 100755
--- a/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
+++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
@@ -44,6 +44,7 @@ bazel \
   --bazelrc=tools/remote_build/kokoro.bazelrc \
   test \
   --invocation_id="${BAZEL_INVOCATION_ID}" \
+  --workspace_status_command=tools/remote_build/workspace_status_kokoro.sh \
   $@ \
   -- //test/... || FAILED="true"
 
diff --git a/tools/remote_build/workspace_status_kokoro.sh b/tools/remote_build/workspace_status_kokoro.sh
new file mode 100755
index 00000000000..8d5db7f8bd5
--- /dev/null
+++ b/tools/remote_build/workspace_status_kokoro.sh
@@ -0,0 +1,26 @@
+#!/bin/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.
+
+# Adds additional labels to results page for Bazel RBE builds on Kokoro
+
+# Provide a way to go from Bazel RBE links back to Kokoro job results
+# which is important for debugging test infrastructure problems.
+# TODO(jtattermusch): replace this workaround by something more user-friendly.
+echo "KOKORO_RESULTSTORE_URL https://source.cloud.google.com/results/invocations/${KOKORO_BUILD_ID}"
+echo "KOKORO_SPONGE_URL http://sponge.corp.google.com/${KOKORO_BUILD_ID}"
+
+echo "KOKORO_BUILD_NUMBER ${KOKORO_BUILD_NUMBER}"
+echo "KOKORO_JOB_NAME ${KOKORO_JOB_NAME}"
+echo "KOKORO_GITHUB_COMMIT ${KOKORO_GITHUB_COMMIT}"