From 416c141775f526419b8292e10d6e75d247223557 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 28 Jul 2018 17:43:04 -0700
Subject: [PATCH] `export SKIP_INSTALL=1` to reset the network without
 reinstalling the snap

---
 ci/testnet-deploy.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 174ad65a2f..3a8b45d545 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -39,6 +39,7 @@ if [[ -z $SOLANA_NET_URL ]]; then
   esac
 fi
 
+# Figure installation command
 SNAP_INSTALL_CMD="sudo snap install solana --$SOLANA_SNAP_CHANNEL --devmode"
 LOCAL_SNAP=$1
 if [[ -n $LOCAL_SNAP ]]; then
@@ -48,6 +49,12 @@ if [[ -n $LOCAL_SNAP ]]; then
   fi
   SNAP_INSTALL_CMD="sudo snap install ~/solana_local.snap --devmode --dangerous"
 fi
+SNAP_INSTALL_CMD="sudo snap remove solana; $SNAP_INSTALL_CMD"
+
+# `export SKIP_INSTALL=1` to reset the network without reinstalling the snap
+if [[ -n $SKIP_INSTALL ]]; then
+  SNAP_INSTALL_CMD="echo Install skipped"
+fi
 
 echo "+++ Configuration"
 publicUrl="$SOLANA_NET_URL"
@@ -57,8 +64,9 @@ else
   publicIp=$(dig +short $publicUrl | head -n1)
 fi
 
-echo "Network entrypoint URL: $publicUrl ($publicIp)"
+echo "Network entry point URL: $publicUrl ($publicIp)"
 echo "Snap channel: $SOLANA_SNAP_CHANNEL"
+echo "Install command: $SNAP_INSTALL_CMD"
 [[ -z $LOCAL_SNAP ]] || echo "Local snap: $LOCAL_SNAP"
 
 leaderName=${publicUrl//./-}
@@ -227,7 +235,6 @@ client_stop() {
         tmux list-sessions; \
         tmux capture-pane -t solana -p; \
         tmux kill-session -t solana; \
-        sudo snap remove solana; \
         $SNAP_INSTALL_CMD; \
         sudo snap set solana metrics-config=$SOLANA_METRICS_CONFIG \
           rust-log=$RUST_LOG \
@@ -272,7 +279,6 @@ fullnode_start() {
       "\
         set -ex; \
         logmarker='solana deploy $(date)/$RANDOM'; \
-        sudo snap remove solana; \
         logger \$logmarker; \
         $SNAP_INSTALL_CMD; \
         sudo snap set solana $nodeConfig; \
@@ -311,7 +317,10 @@ fullnode_stop() {
 
   (
     SECONDS=0
-    gcp_vm_exec "$vmName" "$vmZone" "Shutting down" "sudo snap remove solana"
+    gcp_vm_exec "$vmName" "$vmZone" "Shutting down" "\
+      if snap list solana; then \
+        sudo snap set solana mode=; \
+      fi"
     echo "Succeeded in ${SECONDS} seconds"
   ) > "log-$vmName.txt" 2>&1 &
   declare pid=$!