From 96c1443305124c70c4a273a19be252fa30d7d9c6 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 26 Apr 2024 18:43:54 -0700 Subject: [PATCH] Better source_install_lib: add retries and print checksum --- .../scripts/psm-interop-test-node.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/grpc-js-xds/scripts/psm-interop-test-node.sh b/packages/grpc-js-xds/scripts/psm-interop-test-node.sh index 74f78f05d..adfe813ed 100755 --- a/packages/grpc-js-xds/scripts/psm-interop-test-node.sh +++ b/packages/grpc-js-xds/scripts/psm-interop-test-node.sh @@ -20,6 +20,19 @@ readonly GITHUB_REPOSITORY_NAME="grpc-node" readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" readonly BUILD_SCRIPT_DIR="$(dirname "$0")" -echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}" -source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")" +psm::lang::source_install_lib() { + echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}" + local install_lib + # Download to a tmp file. + install_lib="$(mktemp -d)/psm_interop_kokoro_lib.sh" + curl -s --retry=5 --retry-connrefused -o "${install_lib}" "${TEST_DRIVER_INSTALL_SCRIPT_URL}" + # Checksum. + if command -v sha256sum &> /dev/null; then + echo "Install script checksum:" + sha256sum "${install_lib}" + fi + source "${install_lib}" +} + +psm::lang::source_install_lib psm::run "${PSM_TEST_SUITE}"