From 020d34187c637c71b12bed197f321760dd16b317 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 20 Sep 2019 15:45:44 -0700
Subject: [PATCH] Fetch logs on redeploy failure

---
 ci/testnet-manager.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 6e1e1ec55..0b2bbd390 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -210,6 +210,19 @@ EOF
   fi
 fi
 
+maybe_deploy_software() {
+  declare ok=true
+  (
+    echo "--- net.sh restart"
+    set -x
+    time net/net.sh restart --skip-setup --deploy-if-newer -t "$CHANNEL_OR_TAG"
+  ) || ok=false
+  if ! $ok; then
+    net/net.sh logs
+  fi
+  $ok
+}
+
 sanity() {
   echo "--- sanity $TESTNET"
   case $TESTNET in
@@ -220,11 +233,7 @@ sanity() {
       NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh edge-testnet-solana-com gce -P us-west1-b
     )
-    (
-      echo "--- net.sh restart"
-      set -x
-      time net/net.sh restart --skip-setup --deploy-if-newer -t "$CHANNEL_OR_TAG"
-    )
+    maybe_deploy_software
     ;;
   testnet-edge-perf)
     (
@@ -241,11 +250,7 @@ sanity() {
       NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh beta-testnet-solana-com gce us-west1-b
     )
-    (
-      echo "--- net.sh restart"
-      set -x
-      time net/net.sh restart --skip-setup --deploy-if-newer -t "$CHANNEL_OR_TAG"
-    )
+    maybe_deploy_software
     ;;
   testnet-beta-perf)
     (