Merge pull request #2482 from XuanWang-Amos/backport-1.8-file_multiple_url_map

murgatroid99 · web-flow · commit d2d17b0b694d · 2023-06-23T10:54:03.000-07:00
[PSM interop] Don't fail target if sub-target already failed (@grpc/grpc-js@1.8.x backport)
diff --git a/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh b/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
@@ -156,7 +156,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
`@@ -156,7 +156,7 @@ main() {`
`156`	`156`	`build_docker_images_if_needed`
`157`	`157`	`# Run tests`
`158`	`158`	`cd "${TEST_DRIVER_FULL_DIR}"`
`159`		`- run_test url_map`
	`159`	`+ run_test url_map \|\| echo "Failed url_map test"`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`main "$@"`