diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh index 74d4fd3cf5..8a0c2258fe 100755 --- a/ci/testnet-deploy.sh +++ b/ci/testnet-deploy.sh @@ -13,6 +13,7 @@ snapChannel=edge tarChannelOrTag=edge delete=false enableGpu=false +bootDiskType="" leaderRotation=true useTarReleaseChannel=false @@ -45,7 +46,8 @@ Deploys a CD testnet -g - Enable GPU (default: $enableGpu) -b - Disable leader rotation -a [address] - Set the bootstrap fullnode's external IP address to this GCE address - -d - Delete the network + -d [disk-type] - Specify a boot disk type (default None) Use pd-ssd to get ssd on GCE. + -D - Delete the network Note: the SOLANA_METRICS_CONFIG environment variable is used to configure metrics @@ -61,7 +63,7 @@ zone=$3 [[ -n $zone ]] || usage "Zone not specified" shift 3 -while getopts "h?p:Pn:c:s:t:gG:a:db" opt; do +while getopts "h?p:Pn:c:s:t:gG:a:Dbd:" opt; do case $opt in h | \?) usage @@ -110,6 +112,9 @@ while getopts "h?p:Pn:c:s:t:gG:a:db" opt; do bootstrapFullNodeAddress=$OPTARG ;; d) + bootDiskType=$OPTARG + ;; + D) delete=true ;; *) @@ -127,6 +132,10 @@ create_args=( -z "$zone" ) +if [[ -n $bootDiskType ]]; then + create_args+=(-d "$bootDiskType") +fi + if $enableGpu; then if [[ -z $bootstrapFullNodeMachineType ]]; then create_args+=(-g) diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 729b25b786..211ae6f333 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -204,7 +204,7 @@ start() { export NO_VALIDATOR_SANITY=1 ci/testnet-deploy.sh edge-testnet-solana-com ec2 us-west-1a \ -t "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a eipalloc-0ccd4f2239886fa94 \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} ) ;; testnet-edge-perf) @@ -217,7 +217,7 @@ start() { ci/testnet-deploy.sh edge-perf-testnet-solana-com ec2 us-west-2b \ -g -t "$CHANNEL_OR_TAG" -c 2 \ -b \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} ) ;; testnet-beta) @@ -230,7 +230,7 @@ start() { ci/testnet-deploy.sh beta-testnet-solana-com ec2 us-west-1a \ -t "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a eipalloc-0f286cf8a0771ce35 \ -b \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} ) ;; testnet-beta-perf) @@ -243,7 +243,7 @@ start() { ci/testnet-deploy.sh beta-perf-testnet-solana-com ec2 us-west-2b \ -g -t "$CHANNEL_OR_TAG" -c 2 \ -b \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} ) ;; testnet) @@ -255,11 +255,11 @@ start() { export NO_VALIDATOR_SANITY=1 #ci/testnet-deploy.sh testnet-solana-com gce us-east1-c \ # -s "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a testnet-solana-com \ - # ${maybeDelete:+-d} + # ${maybeDelete:+-D} ci/testnet-deploy.sh testnet-solana-com ec2 us-west-1a \ -t "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a eipalloc-0fa502bf95f6f18b2 \ -b \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} ) ;; testnet-perf) @@ -274,11 +274,11 @@ start() { -t "$CHANNEL_OR_TAG" -c 2 \ -b \ -d pd-ssd \ - ${maybeDelete:+-d} + ${maybeDelete:+-D} #ci/testnet-deploy.sh perf-testnet-solana-com ec2 us-east-1a \ # -g \ # -t "$CHANNEL_OR_TAG" -c 2 \ - # ${maybeDelete:+-d} + # ${maybeDelete:+-D} ) ;; *)