From 54cf9aaa1e7737e6b078c2f9d0d08d00332724fb Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 19 Sep 2019 23:02:47 -0700
Subject: [PATCH] Preserve public network flag when testnet-edge is restarted

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

diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 7cce5c144..6e1e1ec55 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -218,7 +218,7 @@ sanity() {
       set -x
       NO_INSTALL_CHECK=1 \
       NO_VALIDATOR_SANITY=1 \
-        ci/testnet-sanity.sh edge-testnet-solana-com gce us-west1-b
+        ci/testnet-sanity.sh edge-testnet-solana-com gce -P us-west1-b
     )
     (
       echo "--- net.sh restart"
diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index d6ac1647d..5a9086483 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -30,6 +30,12 @@ cloudProvider=$2
 [[ -n $netName ]] || usage ""
 [[ -n $cloudProvider ]] || usage "Cloud provider not specified"
 shift 2
+
+maybePublicNetwork=
+if [[ $1 = -P ]]; then
+  maybePublicNetwork=-P
+  shift
+fi
 [[ -n $1 ]] || usage "zone1 not specified"
 
 shutdown() {
@@ -54,7 +60,7 @@ trap shutdown EXIT INT
 set -x
 for zone in "$@"; do
   echo "--- $cloudProvider config [$zone]"
-  timeout 5m net/"$cloudProvider".sh config -p "$netName" -z "$zone"
+  timeout 5m net/"$cloudProvider".sh config $maybePublicNetwork -p "$netName" -z "$zone"
   net/init-metrics.sh -e
   echo "+++ $cloudProvider.sh info"
   net/"$cloudProvider".sh info