From d83a599c974fb543fc395f52ef3ae3f7329546f0 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 13 Jan 2023 15:42:45 -0500 Subject: [PATCH] xds interop: Fix buildscripts not continuing on a failed test suite (#9817) Apparently there's a difference between bash 3 and bash 4. OSX comes with bash 3 out-of-box, so for whoever wrote this logic it "worked on my machine". --- buildscripts/kokoro/psm-security.sh | 2 +- buildscripts/kokoro/xds_k8s_lb.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/kokoro/psm-security.sh b/buildscripts/kokoro/psm-security.sh index defe427e5d7..a4cec90d93d 100755 --- 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++ )) + run_test $test || (( failed_tests++ )) && true 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 index 6e0277ecb81..a53b57326af 100755 --- 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++ )) + run_test $test || (( failed_tests++ )) && true done echo "Failed test suites: ${failed_tests}" if (( failed_tests > 0 )); then