From 297166e550529601e2bb12dbbb3116d66683c90f Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 26 Apr 2019 20:27:25 -0700
Subject: [PATCH] v0.11: testnet-deploy updates

---
 ci/testnet-deploy.sh  | 8 ++------
 ci/testnet-manager.sh | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 281c1b5747..9cedfe58e0 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -12,6 +12,7 @@ additionalFullNodeCount=10
 publicNetwork=false
 skipSetup=false
 skipStart=false
+stopNetwork=false
 externalNode=false
 tarChannelOrTag=edge
 delete=false
@@ -176,7 +177,7 @@ fi
 if ! $skipSetup; then
   echo "--- $cloudProvider.sh delete"
   # shellcheck disable=SC2068
-  time net/"$cloudProvider".sh delete ${zone_args[@]} -p "$netName" ${externalNode:+-x}
+  time net/"$cloudProvider".sh delete ${zone_args[@]} -p "$netName"
   if $delete; then
     exit 0
   fi
@@ -235,9 +236,6 @@ else
 fi
 net/init-metrics.sh -e
 
-echo "+++ $cloudProvider.sh info"
-net/"$cloudProvider".sh info
-
 if $stopNetwork; then
   echo --- net.sh stop
   time net/net.sh stop
@@ -289,8 +287,6 @@ if ! $skipStart; then
       $maybeNoValidatorSanity \
       $maybeNoLedgerVerify
   ) || ok=false
-
-  net/net.sh logs
 fi
 
 $ok
diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 0bee946661..53c771ab6b 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -350,7 +350,7 @@ deploy() {
       NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=warn \
         ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \
-          -G "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
+          -G "n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
           -t "$CHANNEL_OR_TAG" -c 2 \
           -b \
           -d pd-ssd \