From fc8a57d670afe9e42d0445685ac945ec8dfa364e Mon Sep 17 00:00:00 2001
From: sanjaypujare <sanjaypujare@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:23:23 -0700
Subject: [PATCH] xds-k8s/xlang: increase timeout to 9 hours and misc changes
 (#27339)

---
 tools/internal_ci/linux/grpc_xds_k8s_xlang.cfg |  2 +-
 tools/internal_ci/linux/grpc_xds_k8s_xlang.sh  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/internal_ci/linux/grpc_xds_k8s_xlang.cfg b/tools/internal_ci/linux/grpc_xds_k8s_xlang.cfg
index 6b7c6d7467a..01fc6418f21 100644
--- a/tools/internal_ci/linux/grpc_xds_k8s_xlang.cfg
+++ b/tools/internal_ci/linux/grpc_xds_k8s_xlang.cfg
@@ -16,7 +16,7 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh"
-timeout_mins: 420
+timeout_mins: 540
 action {
   define_artifacts {
     regex: "artifacts/**/*sponge_log.xml"
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh b/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh
index b44bd795dd1..0476c1dfcf9 100755
--- a/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh
+++ b/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh
@@ -60,7 +60,6 @@ run_test() {
     --xml_output_file="${TEST_XML_OUTPUT_DIR}/${tag}/${clang}-${slang}/sponge_log.xml" \
     --force_cleanup \
     --nocheck_local_certs
-  set +x
 }
 
 #######################################
@@ -98,6 +97,8 @@ main() {
   fi
 
   local failed_tests=0
+  local successful_string
+  local failed_string
   # Run tests
   for TAG in ${VERSION_TAG}
   do
@@ -106,12 +107,20 @@ main() {
     for SLANG in ${SERVER_LANG}
     do
       if [ "${CLANG}" != "${SLANG}" ]; then
-        run_test "${TAG}" "${SLANG}" "${CLANG}" || (( failed_tests++ ))
+        if run_test "${TAG}" "${SLANG}" "${CLANG}"; then
+          successful_string="${successful_string} ${TAG}/${CLANG}-${SLANG}"
+        else
+          failed_tests=$((failed_tests+1))
+          failed_string="${failed_string} ${TAG}/${CLANG}-${SLANG}"
+        fi
       fi
     done
     echo "Failed test suites: ${failed_tests}"
     done
   done
+  set +x
+  echo "Failed test suites list: ${failed_string}"
+  echo "Successful test suites list: ${successful_string}"
   if (( failed_tests > 0 )); then
     exit 1
   fi