From d9f9e347abef033ebbd642ef093338cf7a4ddb9f Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 7 Nov 2018 10:07:06 -0800
Subject: [PATCH] Delete testnet-master, testnet-master-perf

---
 README.md             | 10 +++++----
 ci/testnet-manager.sh | 52 +------------------------------------------
 2 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index 86638b740..f0b0766f2 100644
--- a/README.md
+++ b/README.md
@@ -371,10 +371,12 @@ Testnet Debugging
 
 We maintain several testnets:
 
-* `testnet` - public beta channel testnet accessible via testnet.solana.com. Runs 24/7
-* `testnet-perf` - permissioned beta channel testnet running a 24/7 soak test.
-* `testnet-master` - public edge channel testnet accessible via master.testnet.solana.com. Runs 24/7
-* `testnet-master-perf` - permissioned edge channel testnet running a multi-hour soak test weekday mornings.
+* `testnet` - public stable testnet accessible via testnet.solana.com. Runs 24/7
+* `testnet-perf` - permissioned stable testnet running a 24/7 soak test.
+* `testnet-edge` - permissioned edge channel testnet. Runs 24/7
+* `testnet-edge-perf` - permissioned edge channel testnet running a multi-hour soak test weekday mornings.
+* `testnet-beta` - permissioned beta channel testnet. Runs 24/7
+* `testnet-beta-perf` - permissioned beta channel testnet running a multi-hour soak test weekday mornings.
 
 ## Deploy process
 
diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 59495ddf4..50c3557ec 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -33,10 +33,6 @@ steps:
             value: "testnet"
           - label: "testnet-perf"
             value: "testnet-perf"
-          - label: "testnet-master"
-            value: "testnet-master"
-          - label: "testnet-master-perf"
-            value: "testnet-master-perf"
           - label: "testnet-edge"
             value: "testnet-edge"
           - label: "testnet-edge-perf"
@@ -72,7 +68,7 @@ ci/channel-info.sh
 eval "$(ci/channel-info.sh)"
 
 case $TESTNET in
-testnet-edge|testnet-edge-perf|testnet-master|testnet-master-perf)
+testnet-edge|testnet-edge-perf)
   CHANNEL_OR_TAG=edge
   CHANNEL_BRANCH=$EDGE_CHANNEL
   ;;
@@ -157,27 +153,6 @@ sanity() {
       ci/testnet-sanity.sh beta-perf-testnet-solana-com ec2 us-west-2b
     )
     ;;
-  testnet-master)
-    # shellcheck disable=2030
-    # shellcheck disable=2031
-    (
-      set -ex
-      export NO_LEDGER_VERIFY=1
-      export NO_VALIDATOR_SANITY=1
-      ci/testnet-sanity.sh master-testnet-solana-com gce us-west1-b
-    )
-    ;;
-  testnet-master-perf)
-    # shellcheck disable=2030
-    # shellcheck disable=2031
-    (
-      set -ex
-      export REJECT_EXTRA_NODES=1
-      export NO_LEDGER_VERIFY=1
-      export NO_VALIDATOR_SANITY=1
-      ci/testnet-sanity.sh master-perf-testnet-solana-com gce us-west1-b
-    )
-    ;;
   testnet)
     # shellcheck disable=2030
     # shellcheck disable=2031
@@ -264,31 +239,6 @@ start() {
         ${maybeDelete:+-d}
     )
     ;;
-  testnet-master)
-    # shellcheck disable=2030
-    # shellcheck disable=2031
-    (
-      set -ex
-      export NO_LEDGER_VERIFY=1
-      export NO_VALIDATOR_SANITY=1
-      ci/testnet-deploy.sh master-testnet-solana-com gce us-west1-b \
-        -s "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a master-testnet-solana-com \
-        ${maybeDelete:+-d}
-    )
-    ;;
-  testnet-master-perf)
-    # shellcheck disable=2030
-    # shellcheck disable=2031
-    (
-      set -ex
-      export NO_LEDGER_VERIFY=1
-      export NO_VALIDATOR_SANITY=1
-      ci/testnet-deploy.sh master-perf-testnet-solana-com gce us-west1-b \
-        -G "n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
-        -t "$CHANNEL_OR_TAG" -c 2 \
-        ${maybeDelete:+-d}
-    )
-    ;;
   testnet)
     # shellcheck disable=2030
     # shellcheck disable=2031