blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gce.sh: Rename -f flag to better reflect usage (#6318) 

automerge
This commit is contained in:
Trent Nelson 2019-10-10 13:57:03 -06:00 committed by Grimes
parent c2761a1259
commit 81fb9e6a59
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/testnet-manager.sh
View File

@ -425,7 +425,7 @@ deploy() {
# shellcheck disable=SC2068 # shellcheck disable=SC2068
NO_VALIDATOR_SANITY=1 \ NO_VALIDATOR_SANITY=1 \
ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \ ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
-t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u -f \ -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u --allow-boot-failures \
--skip-remote-log-retrieval \ --skip-remote-log-retrieval \
-a demo-testnet-solana-com \ -a demo-testnet-solana-com \
${skipCreate:+-e} \ ${skipCreate:+-e} \
@ -437,7 +437,7 @@ deploy() {
# shellcheck disable=SC2068 # shellcheck disable=SC2068
NO_VALIDATOR_SANITY=1 \ NO_VALIDATOR_SANITY=1 \
ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \ ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
-t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P -f -x \ -t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P --allow-boot-failures -x \
--skip-remote-log-retrieval \ --skip-remote-log-retrieval \
${skipCreate:+-e} \ ${skipCreate:+-e} \
${skipStart:+-s} \ ${skipStart:+-s} \

10
net/gce.sh
View File

@ -119,7 +119,9 @@ Manage testnet instances
zone zone
-x - append to the existing configuration instead of creating a -x - append to the existing configuration instead of creating a
new configuration new configuration
-f - Discard validator nodes that didn't bootup successfully --allow-boot-failures
- Discard from config validator nodes that didn't bootup
successfully
create-specific options: create-specific options:
-n [number] - Number of additional fullnodes (default: $additionalFullNodeCount) -n [number] - Number of additional fullnodes (default: $additionalFullNodeCount)
@ -175,6 +177,9 @@ while [[ -n $1 ]]; do
elif [[ $1 == --machine-type* || $1 == --custom-cpu* ]]; then # Bypass quoted long args for GPUs elif [[ $1 == --machine-type* || $1 == --custom-cpu* ]]; then # Bypass quoted long args for GPUs
shortArgs+=("$1") shortArgs+=("$1")
shift shift
elif [[ $1 == --allow-boot-failures ]]; then
failOnValidatorBootupFailure=false
shift
else else
usage "Unknown long option: $1" usage "Unknown long option: $1"
fi fi
@ -232,9 +237,6 @@ while getopts "h?p:Pn:c:r:z:gG:a:d:uxf" opt "${shortArgs[@]}"; do
x) x)
externalNodes=true externalNodes=true
;; ;;
f)
failOnValidatorBootupFailure=false
;;
*) *)
usage "unhandled option: $opt" usage "unhandled option: $opt"
;; ;;