Appease shellcheck

This commit is contained in:
Dan Albert 2019-04-05 13:40:28 -06:00 committed by Pankaj Garg
parent d570b08134
commit 9d4c6f6aaa
2 changed files with 8 additions and 8 deletions

View File

@ -159,12 +159,12 @@ set -x
# Build a string to pass zone opts to $cloudProvider.sh: "-z zone1 -z zone2 ..." # Build a string to pass zone opts to $cloudProvider.sh: "-z zone1 -z zone2 ..."
zone_args=() zone_args=()
for val in "${zone[@]}"; do for val in "${zone[@]}"; do
zone_args+="-z $val " zone_args+=("-z $val")
done done
if ! $skipSetup; then if ! $skipSetup; then
echo "--- $cloudProvider.sh delete" echo "--- $cloudProvider.sh delete"
time net/"$cloudProvider".sh delete ${zone_args[*]} -p "$netName" ${externalNode:+-x} time net/"$cloudProvider".sh delete ${zone_args[@]} -p "$netName" ${externalNode:+-x}
if $delete; then if $delete; then
exit 0 exit 0
fi fi
@ -176,7 +176,7 @@ if ! $skipSetup; then
-c "$clientNodeCount" -c "$clientNodeCount"
-n "$additionalFullNodeCount" -n "$additionalFullNodeCount"
) )
create_args+=(${zone_args[*]}) create_args+=(${zone_args[@]})
if $blockstreamer; then if $blockstreamer; then
create_args+=(-u) create_args+=(-u)
@ -212,7 +212,7 @@ else
config_args=( config_args=(
-p "$netName" -p "$netName"
) )
config_args+=(${zone_args[*]}) config_args+=(${zone_args[@]})
if $publicNetwork; then if $publicNetwork; then
config_args+=(-P) config_args+=(-P)
fi fi

View File

@ -231,23 +231,23 @@ start() {
# Build an array to pass as opts to testnet-deploy.sh: "-z zone1 -z zone2 ..." # Build an array to pass as opts to testnet-deploy.sh: "-z zone1 -z zone2 ..."
GCE_ZONE_ARGS=() GCE_ZONE_ARGS=()
for val in "${GCE_ZONES[@]}"; do for val in "${GCE_ZONES[@]}"; do
GCE_ZONE_ARGS+="-z $val " GCE_ZONE_ARGS+=("-z $val")
done done
EC2_ZONE_ARGS=() EC2_ZONE_ARGS=()
for val in "${EC2_ZONES[@]}"; do for val in "${EC2_ZONES[@]}"; do
EC2_ZONE_ARGS+="-z $val " EC2_ZONE_ARGS+=("-z $val")
done done
NO_VALIDATOR_SANITY=1 \ NO_VALIDATOR_SANITY=1 \
RUST_LOG=solana=info \ RUST_LOG=solana=info \
ci/testnet-deploy.sh -p beta-testnet-solana-com -C ec2 ${EC2_ZONE_ARGS[*]} \ ci/testnet-deploy.sh -p beta-testnet-solana-com -C ec2 ${EC2_ZONE_ARGS[@]} \
-t "$CHANNEL_OR_TAG" -n 60 -c 0 -s -u -P -a eipalloc-0f286cf8a0771ce35 \ -t "$CHANNEL_OR_TAG" -n 60 -c 0 -s -u -P -a eipalloc-0f286cf8a0771ce35 \
${maybeReuseLedger:+-r} \ ${maybeReuseLedger:+-r} \
${maybeDelete:+-D} ${maybeDelete:+-D}
NO_VALIDATOR_SANITY=1 \ NO_VALIDATOR_SANITY=1 \
RUST_LOG=solana=info \ RUST_LOG=solana=info \
ci/testnet-deploy.sh -p beta-testnet-solana-com -C gce ${GCE_ZONE_ARGS[*]} \ ci/testnet-deploy.sh -p beta-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
-t "$CHANNEL_OR_TAG" -n 40 -c 0 -x -P \ -t "$CHANNEL_OR_TAG" -n 40 -c 0 -x -P \
${maybeReuseLedger:+-r} \ ${maybeReuseLedger:+-r} \
${maybeDelete:+-D} ${maybeDelete:+-D}