Collect and upload network logs

ci/testnet-deploy.sh

@@ -148,16 +148,18 @@ shutdown() {
   exitcode=$?
 
   set +e
-  for logfile in net/log/*; do
+  if [[ -d net/log ]]; then
+    mv net/log net/log-deploy
+    for logfile in net/log-deploy/*; do
       if [[ -f $logfile ]]; then
         upload-ci-artifact "$logfile"
         tail "$logfile"
       fi
     done
-
+  fi
   exit $exitcode
 }
-
+rm -rf net/{log,-deploy}
 trap shutdown EXIT INT
 
 set -x
@@ -185,10 +187,16 @@ maybeNoLedgerVerify=
 if [[ -n $NO_LEDGER_VERIFY ]]; then
   maybeNoLedgerVerify="-o noLedgerVerify"
 fi
-# shellcheck disable=SC2086 # Don't want to double quote maybeRejectExtraNodes
-if $useTarReleaseChannel; then
+
+ok=true
+(
+  # shellcheck disable=SC2086 # Don't want to double quote maybeRejectExtraNodes
+  if $useTarReleaseChannel; then
     time net/net.sh start -t "$tarChannelOrTag" $maybeRejectExtraNodes $maybeNoValidatorSanity $maybeNoLedgerVerify
-else
+  else
     time net/net.sh start -s "$snapChannel" $maybeRejectExtraNodes $maybeNoValidatorSanity $maybeNoLedgerVerify
-fi
-exit 0
+  fi
+) || ok=false
+
+net/net.sh logs
+$ok

ci/testnet-sanity.sh

@@ -36,16 +36,18 @@ shutdown() {
   exitcode=$?
 
   set +e
-  for logfile in net/log/*; do
+  if [[ -d net/log ]]; then
+    mv net/log net/log-sanity
+    for logfile in net/log-sanity/*; do
       if [[ -f $logfile ]]; then
         upload-ci-artifact "$logfile"
         tail "$logfile"
       fi
     done
-
+  fi
   exit $exitcode
 }
-
+rm -rf net/{log,-sanity}
 trap shutdown EXIT INT
 
 set -x
@@ -53,9 +55,11 @@ echo "--- $cloudProvider.sh config"
 timeout 5m net/"$cloudProvider".sh config -p "$netName" -z "$zone"
 net/init-metrics.sh -e
 echo --- net.sh sanity
-timeout 5m net/net.sh sanity \
+ok=true
+timeout 1s net/net.sh sanity \
   ${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
   ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
-  ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
+  ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} || ok=false
 
-exit 0
+net/net.sh logs
+$ok