diff --git a/packages/grpc-js/interop/xds-interop-client.ts b/packages/grpc-js/interop/xds-interop-client.ts index fc45b615..f2c4cb0a 100644 --- a/packages/grpc-js/interop/xds-interop-client.ts +++ b/packages/grpc-js/interop/xds-interop-client.ts @@ -182,7 +182,8 @@ function main() { const argv = yargs .string(['fail_on_failed_rpcs', 'server', 'stats_port']) .number(['num_channels', 'qps']) - .require(['fail_on_failed_rpcs', 'num_channels', 'qps', 'server', 'stats_port']) + .require(['qps', 'server', 'stats_port']) + .default('num_channels', 1) .argv; console.log('Starting xDS interop client. Args: ', argv); const callStatsTracker = new CallStatsTracker(); diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh index e1c59e8e..ae169eeb 100755 --- a/packages/grpc-js/scripts/xds.sh +++ b/packages/grpc-js/scripts/xds.sh @@ -33,4 +33,4 @@ GRPC_NODE_TRACE=all GRPC_NODE_VERBOSITY=DEBUG \ --qps={qps} \ {fail_on_failed_rpc} \ {rpcs_to_send} \ - {metadata_to_send}" \ No newline at end of file + {metadata_to_send}" diff --git a/run-tests.sh b/run-tests.sh index 55a08e49..f23475b9 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -75,15 +75,6 @@ do npm test || FAILED="true" done -if [ "$OS" = "Linux" ] -then - set +ex - nvm use 12 - set -ex - # Run the xds interop tests only on Linux - ./packages/grpc-js/scripts/xds.sh -fi - set +ex nvm use 8 set -ex