From a13083aa65c2be9bf4d5c9c14187af504199f5e0 Mon Sep 17 00:00:00 2001
From: sakridge <sakridge@gmail.com>
Date: Sun, 22 Nov 2020 07:27:26 -0800
Subject: [PATCH] Ignore errors from subshell correctly (#13752)

---
 system-test/testnet-automation.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/system-test/testnet-automation.sh b/system-test/testnet-automation.sh
index 431b9121f5..251a62b635 100755
--- a/system-test/testnet-automation.sh
+++ b/system-test/testnet-automation.sh
@@ -23,21 +23,18 @@ $(eval echo "$@")"
   fi
 
   (
-    set +e
     execution_step "Collecting Logfiles from Nodes"
     collect_logs
-  )
+  ) || echo "Error from collecting logs"
 
   (
-    set +e
     execution_step "Stop Network Software"
     "${REPO_ROOT}"/net/net.sh stop
-  )
+  ) || echo "Error from stopping nodes"
 
   (
-    set +e
     analyze_packet_loss
-  )
+  ) || echo "Error from packet loss analysis"
 
   execution_step "Deleting Testnet"
   "${REPO_ROOT}"/net/"${CLOUD_PROVIDER}".sh delete -p "${TESTNET_TAG}"