grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some test script fixes

This commit is contained in:
Michael Lumish 2020-08-20 14:00:46 -07:00
parent 46c065a75b
commit f246833876
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grpc-js/scripts/xds.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
nvm use 12
set -exu -o pipefail set -exu -o pipefail
[[ -f /VERSION ]] && cat /VERSION [[ -f /VERSION ]] && cat /VERSION
@ -11,14 +9,8 @@ base=$(pwd)
npm run compile npm run compile
cd ../../.. cd ../../..
branch=$(git branch --all --no-color --contains "${KOKORO_GITHUB_COMMIT}" \
| grep -v HEAD | head -1)
shopt -s extglob
branch="${branch//[[:space:]]}"
branch="${branch##remotes/origin/}"
shopt -u extglob
git clone -b "${branch}" --single-branch --depth=1 https://github.com/grpc/grpc.git git clone -b remotes/origin/ --single-branch --depth=1 https://github.com/grpc/grpc.git
grpc/tools/run_tests/helper_scripts/prep_xds.sh grpc/tools/run_tests/helper_scripts/prep_xds.sh

3
run-tests.sh
View File

@ -77,6 +77,9 @@ done
if [ "$OS" = "Linux" ] if [ "$OS" = "Linux" ]
then then
set +ex
nvm use 12
set -ex
# Run the xds interop tests only on Linux # Run the xds interop tests only on Linux
./packages/grpc-js/scripts/xds.sh ./packages/grpc-js/scripts/xds.sh
fi fi