Collect and upload network logs

This commit is contained in:
Michael Vines 2018-12-23 09:11:15 -08:00 committed by Grimes
parent a6fd1ca3db
commit 7f2fa8bbcb
2 changed files with 38 additions and 26 deletions

View File

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

View File

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