From 7a369df9a768e74b96c50e4bb0339049ac577801 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 30 Apr 2019 09:21:07 -0700
Subject: [PATCH] Add flag to skip slow extras when deploying a large testnet

---
 ci/testnet-deploy.sh  | 16 +++++++++++++---
 ci/testnet-manager.sh |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 76c5225591..17552bb4cb 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -22,6 +22,8 @@ enableGpu=false
 bootDiskType=""
 leaderRotation=true
 blockstreamer=false
+deployUpdateManifest=true
+fetchLogs=true
 
 usage() {
   exitcode=0
@@ -61,6 +63,8 @@ Deploys a CD testnet
    -s                   - Skip start.  Nodes will still be created or configured, but network software will not be started.
    -S                   - Stop network software without tearing down nodes.
    -f                   - Discard validator nodes that didn't bootup successfully
+   -w                   - Skip time-consuming "bells and whistles" that are
+                          unnecessary for a high-node count demo testnet
 
    Note: the SOLANA_METRICS_CONFIG environment variable is used to configure
          metrics
@@ -70,7 +74,7 @@ EOF
 
 zone=()
 
-while getopts "h?p:Pn:c:t:gG:a:Dbd:rusxz:p:C:Sfe" opt; do
+while getopts "h?p:Pn:c:t:gG:a:Dbd:rusxz:p:C:Sfew" opt; do
   case $opt in
   h | \?)
     usage
@@ -143,6 +147,10 @@ while getopts "h?p:Pn:c:t:gG:a:Dbd:rusxz:p:C:Sfe" opt; do
   S)
     stopNetwork=true
     ;;
+  w)
+    fetchLogs=false
+    deployUpdateManifest=false
+    ;;
   *)
     usage "Error: unhandled option: $opt"
     ;;
@@ -303,7 +311,7 @@ if ! $skipStart; then
     fi
 
     # shellcheck disable=SC2154 # SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu comes from .buildkite/env/
-    if [[ -n $SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu ]]; then
+    if $deployUpdateManifest && [[ -n $SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu ]]; then
       echo "$SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu" > update_manifest_keypair.json
       args+=(-i update_manifest_keypair.json)
     fi
@@ -312,7 +320,9 @@ if ! $skipStart; then
     time net/net.sh "${args[@]}"
   ) || ok=false
 
-  net/net.sh logs
+  if $fetchLogs; then
+    net/net.sh logs
+  fi
 fi
 
 $ok
diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 379bfa3cf7..3d075cceb6 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -417,7 +417,7 @@ deploy() {
       NO_LEDGER_VERIFY=1 \
       NO_VALIDATOR_SANITY=1 \
         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 -f -w \
           -a demo-testnet-solana-com \
           ${skipCreate:+-e} \
           ${maybeSkipStart:+-s} \