diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 77f430a61..859fd2d14 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -142,8 +142,6 @@ testnet-beta|testnet-beta-perf) testnet) CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG CHANNEL_BRANCH=$STABLE_CHANNEL - : "${EC2_NODE_COUNT:=3}" - : "${GCE_NODE_COUNT:=}" ;; testnet-perf) CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG @@ -252,19 +250,9 @@ sanity() { testnet) ( set -x - - ok=true - if [[ -n $EC2_NODE_COUNT ]]; then - NO_LEDGER_VERIFY=1 \ - ci/testnet-sanity.sh testnet-solana-com ec2 "${EC2_ZONES[0]}" || ok=false - elif [[ -n $GCE_NODE_COUNT ]]; then - NO_LEDGER_VERIFY=1 \ - ci/testnet-sanity.sh testnet-solana-com gce "${GCE_ZONES[0]}" || ok=false - else - echo "Error: no EC2 or GCE nodes" - ok=false - fi - $ok + NO_LEDGER_VERIFY=1 \ + NO_VALIDATOR_SANITY=1 \ + ci/testnet-sanity.sh testnet-solana-com gcp us-west1-b ) ;; testnet-perf) @@ -387,30 +375,14 @@ deploy() { testnet) ( set -x - - if [[ -n $GCE_NODE_COUNT ]] || [[ -n $skipStart ]]; then - maybeSkipStart="skip" - fi - - # shellcheck disable=SC2068 - ci/testnet-deploy.sh -p testnet-solana-com -C ec2 ${EC2_ZONE_ARGS[@]} \ - -t "$CHANNEL_OR_TAG" -n "$EC2_NODE_COUNT" -c 0 -u -P -f \ - -a eipalloc-0fa502bf95f6f18b2 --letsencrypt testnet.solana.com \ - ${skipCreate:+-e} \ - ${maybeSkipStart:+-s} \ - ${maybeStop:+-S} \ - ${maybeDelete:+-D} - - if [[ -n $GCE_NODE_COUNT ]]; then - # shellcheck disable=SC2068 - ci/testnet-deploy.sh -p testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \ - -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -f \ + NO_VALIDATOR_SANITY=1 \ + ci/testnet-deploy.sh -p testnet-solana-com -C gcp -z us-west1-b \ + -t "$CHANNEL_OR_TAG" -n 2 -c 0 -u -P \ + -a testnet-solana-com --letsencrypt testnet.solana.com \ ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ - ${maybeDelete:+-D} \ - -x - fi + ${maybeDelete:+-D} ) ;; testnet-perf)