[PSM interop] Don't fail target if sub-target already failed (#33222) (#33303)

XuanWang-Amos · web-flow · commit 6894b4becebe · 2023-05-31T16:52:04.000-07:00
We configured TestGrid to file bug separately for each failed
sub-target, if we still fail the main target, TestGrid will fail
duplicate bugs.




&lt;!--

If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the
appropriate
lang label.

--&gt;
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_lb.sh b/tools/internal_ci/linux/grpc_xds_k8s_lb.sh
@@ -174,9 +174,6 @@ main() {
     run_test $test || (( ++failed_tests ))
   done
   echo "Failed test suites: ${failed_tests}"
-  if (( failed_tests > 0 )); then
-    exit 1
-  fi
 }
 
 main "$@"
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh b/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh
@@ -179,9 +179,6 @@ main() {
     run_test $test || (( ++failed_tests ))
   done
   echo "Failed test suites: ${failed_tests}"
-  if (( failed_tests > 0 )); then
-    exit 1
-  fi
 }
 
 main "$@"
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh b/tools/internal_ci/linux/grpc_xds_k8s_xlang.sh
@@ -96,9 +96,6 @@ main() {
   set +x
   echo "Failed test suites list: ${failed_string}"
   echo "Successful test suites list: ${successful_string}"
-  if (( failed_tests > 0 )); then
-    exit 1
-  fi
 }
 
 main "$@"
diff --git a/tools/internal_ci/linux/psm-security-python.sh b/tools/internal_ci/linux/psm-security-python.sh
@@ -179,9 +179,6 @@ main() {
     run_test $test || (( ++failed_tests ))
   done
   echo "Failed test suites: ${failed_tests}"
-  if (( failed_tests > 0 )); then
-    exit 1
-  fi
 }
 
 main "$@"
diff --git a/tools/internal_ci/linux/psm-security.sh b/tools/internal_ci/linux/psm-security.sh
@@ -163,9 +163,6 @@ main() {
     run_test $test || (( ++failed_tests ))
   done
   echo "Failed test suites: ${failed_tests}"
-  if (( failed_tests > 0 )); then
-    exit 1
-  fi
 }
 
 main "$@"

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,6 @@ main() {`
`174`	`174`	`run_test $test \|\| (( ++failed_tests ))`
`175`	`175`	`done`
`176`	`176`	`echo "Failed test suites: ${failed_tests}"`
`177`		`- if (( failed_tests > 0 )); then`
`178`		`- exit 1`
`179`		`- fi`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,6 @@ main() {`
`179`	`179`	`run_test $test \|\| (( ++failed_tests ))`
`180`	`180`	`done`
`181`	`181`	`echo "Failed test suites: ${failed_tests}"`
`182`		`- if (( failed_tests > 0 )); then`
`183`		`- exit 1`
`184`		`- fi`
`185`	`182`	`}`
`186`	`183`
`187`	`184`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,6 @@ main() {`
`96`	`96`	`set +x`
`97`	`97`	`echo "Failed test suites list: ${failed_string}"`
`98`	`98`	`echo "Successful test suites list: ${successful_string}"`
`99`		`- if (( failed_tests > 0 )); then`
`100`		`- exit 1`
`101`		`- fi`
`102`	`99`	`}`
`103`	`100`
`104`	`101`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,6 @@ main() {`
`163`	`163`	`run_test $test \|\| (( ++failed_tests ))`
`164`	`164`	`done`
`165`	`165`	`echo "Failed test suites: ${failed_tests}"`
`166`		`- if (( failed_tests > 0 )); then`
`167`		`- exit 1`
`168`		`- fi`
`169`	`166`	`}`
`170`	`167`
`171`	`168`	`main "$@"`