From 728cde0b061aa5b272e4fb232f4766475656ace0 Mon Sep 17 00:00:00 2001
From: Pankaj Garg <pankaj@solana.com>
Date: Thu, 4 Apr 2019 00:36:43 +0000
Subject: [PATCH] Force delete all beta testnet nodes before restarting them

---
 ci/testnet-manager.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index b2af10499e..99bf7687a4 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -207,18 +207,30 @@ start() {
   testnet-beta)
     (
       set -x
+      # Force delete the network, as two different cloud providers are being used
+      # (otherwise, a subset of the nodes stay up while first cloud is deleted,
+      #  and the leader might be in that subset)
       NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=info \
         ci/testnet-deploy.sh beta-testnet-solana-com ec2 us-west-1a \
-          -t "$CHANNEL_OR_TAG" -n 35 -c 0 -s -u -P -a eipalloc-0f286cf8a0771ce35 \
-          ${maybeReuseLedger:+-r} \
-          ${maybeDelete:+-D}
+          -t "$CHANNEL_OR_TAG" -n 35 -c 0 -s -u -P -a eipalloc-0f286cf8a0771ce35 -D
       NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=info \
         ci/testnet-deploy.sh beta-testnet-solana-com gce us-west1-a \
-          -t "$CHANNEL_OR_TAG" -n 65 -c 0 -x -P \
-          ${maybeReuseLedger:+-r} \
-          ${maybeDelete:+-D}
+          -t "$CHANNEL_OR_TAG" -n 65 -c 0 -x -P -D
+
+      if ! $maybeDelete; then
+        NO_VALIDATOR_SANITY=1 \
+        RUST_LOG=solana=info \
+          ci/testnet-deploy.sh beta-testnet-solana-com ec2 us-west-1a \
+            -t "$CHANNEL_OR_TAG" -n 35 -c 0 -s -u -P -a eipalloc-0f286cf8a0771ce35 \
+            ${maybeReuseLedger:+-r}
+        NO_VALIDATOR_SANITY=1 \
+        RUST_LOG=solana=info \
+          ci/testnet-deploy.sh beta-testnet-solana-com gce us-west1-a \
+            -t "$CHANNEL_OR_TAG" -n 65 -c 0 -x -P \
+            ${maybeReuseLedger:+-r}
+      fi
     )
     ;;
   testnet-beta-perf)