Revert "xds interop: Fix buildscripts not continuing on a failed test…

… suite (grpc#9817)" (grpc#9831) This reverts commit d83a599. Reverted in favor of better syntax suggested here: grpc/grpc-node#2323 (review). This fix will be sent as another PR for the convenience of backporting.
Bongo1998 · Jan 17, 2023 · 42ba00b · 42ba00b
1 parent ed71b0a
commit 42ba00b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildscripts/kokoro/psm-security.sh b/buildscripts/kokoro/psm-security.sh
@@ -177,7 +177,7 @@ main() {
   local failed_tests=0
   test_suites=("baseline_test" "security_test" "authz_test")
   for test in "${test_suites[@]}"; do
-    run_test $test || (( failed_tests++ )) && true
+    run_test $test || (( failed_tests++ ))
   done
   echo "Failed test suites: ${failed_tests}"
   if (( failed_tests > 0 )); then

diff --git a/buildscripts/kokoro/xds_k8s_lb.sh b/buildscripts/kokoro/xds_k8s_lb.sh
@@ -178,7 +178,7 @@ main() {
   local failed_tests=0
   test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test" "outlier_detection_test" "custom_lb_test")
   for test in "${test_suites[@]}"; do
-    run_test $test || (( failed_tests++ )) && true
+    run_test $test || (( failed_tests++ ))
   done
   echo "Failed test suites: ${failed_tests}"
   if (( failed_tests > 0 )); then