[PSM interop] Don't fail url_map target if sub-target already failed (v1.54.x backport) (#33525)

XuanWang-Amos · web-flow · commit da9ef3403dae · 2023-06-23T09:45:43.000-07:00
Backport of #33520 to v1.54.x. --- Follow up change of #33222. We don't want file multiple bugs if any of the sub-tests of the `url_map` test fails.
diff --git a/tools/internal_ci/linux/grpc_xds_url_map.sh b/tools/internal_ci/linux/grpc_xds_url_map.sh
@@ -143,7 +143,7 @@ main() {
   build_docker_images_if_needed
   # Run tests
   cd "${TEST_DRIVER_FULL_DIR}"
-  run_test url_map
+  run_test url_map || echo "Failed url_map test"
 }
 
 main "$@"
diff --git a/tools/internal_ci/linux/grpc_xds_url_map_python.sh b/tools/internal_ci/linux/grpc_xds_url_map_python.sh
@@ -153,7 +153,7 @@ main() {
   build_docker_images_if_needed
   # Run tests
   cd "${TEST_DRIVER_FULL_DIR}"
-  run_test url_map
+  run_test url_map || echo "Failed url_map test"
 }
 
 main "$@"

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ main() {`
`143`	`143`	`build_docker_images_if_needed`
`144`	`144`	`# Run tests`
`145`	`145`	`cd "${TEST_DRIVER_FULL_DIR}"`
`146`		`- run_test url_map`
	`146`	`+ run_test url_map \|\| echo "Failed url_map test"`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ main() {`
`153`	`153`	`build_docker_images_if_needed`
`154`	`154`	`# Run tests`
`155`	`155`	`cd "${TEST_DRIVER_FULL_DIR}"`
`156`		`- run_test url_map`
	`156`	`+ run_test url_map \|\| echo "Failed url_map test"`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`main "$@"`