Move testnet from ec2 tp gcp

This commit is contained in:
Michael Vines 2019-08-04 21:02:27 -07:00 committed by GitHub
parent 3f0ff45de0
commit e56efe237c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -142,8 +142,6 @@ testnet-beta|testnet-beta-perf)
testnet) testnet)
CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG
CHANNEL_BRANCH=$STABLE_CHANNEL CHANNEL_BRANCH=$STABLE_CHANNEL
: "${EC2_NODE_COUNT:=3}"
: "${GCE_NODE_COUNT:=}"
;; ;;
testnet-perf) testnet-perf)
CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG
@ -252,19 +250,9 @@ sanity() {
testnet) testnet)
( (
set -x set -x
ok=true
if [[ -n $EC2_NODE_COUNT ]]; then
NO_LEDGER_VERIFY=1 \ NO_LEDGER_VERIFY=1 \
ci/testnet-sanity.sh testnet-solana-com ec2 "${EC2_ZONES[0]}" || ok=false NO_VALIDATOR_SANITY=1 \
elif [[ -n $GCE_NODE_COUNT ]]; then ci/testnet-sanity.sh testnet-solana-com gcp us-west1-b
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
) )
;; ;;
testnet-perf) testnet-perf)
@ -387,30 +375,14 @@ deploy() {
testnet) testnet)
( (
set -x set -x
NO_VALIDATOR_SANITY=1 \
if [[ -n $GCE_NODE_COUNT ]] || [[ -n $skipStart ]]; then ci/testnet-deploy.sh -p testnet-solana-com -C gcp -z us-west1-b \
maybeSkipStart="skip" -t "$CHANNEL_OR_TAG" -n 2 -c 0 -u -P \
fi -a testnet-solana-com --letsencrypt testnet.solana.com \
# 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 \
${skipCreate:+-e} \ ${skipCreate:+-e} \
${skipStart:+-s} \ ${skipStart:+-s} \
${maybeStop:+-S} \ ${maybeStop:+-S} \
${maybeDelete:+-D} \ ${maybeDelete:+-D}
-x
fi
) )
;; ;;
testnet-perf) testnet-perf)