diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh index 47a94696f5..0b049de3ef 100755 --- a/ci/localnet-sanity.sh +++ b/ci/localnet-sanity.sh @@ -6,6 +6,7 @@ cd "$(dirname "$0")"/.. source ci/upload_ci_artifact.sh +source multinode-demo/common.sh ./multinode-demo/setup.sh @@ -21,10 +22,8 @@ for cmd in $backgroundCommands; do echo "pid: $pid" done -shutdown() { - exitcode=$? +killBackgroundCommands() { set +e - echo --- Shutdown for pid in "${pids[@]}"; do if kill "$pid"; then wait "$pid" @@ -32,7 +31,17 @@ shutdown() { echo -e "^^^ +++\\nWarning: unable to kill $pid" fi done + set -e + pids=() +} +shutdown() { + exitcode=$? + killBackgroundCommands + + set +e + + echo "--- Upload artifacts" for cmd in $backgroundCommands; do declare logfile=log-$cmd.txt upload_ci_artifact "$logfile" @@ -58,6 +67,9 @@ echo "--- Node count" ./multinode-demo/client.sh "$PWD" 3 -c --addr 127.0.0.1 ) +echo "--- Ledger verification" +killBackgroundCommands +$solana_ledger_tool --ledger "$SOLANA_CONFIG_DIR"/ledger verify echo +++ echo Ok diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh index 480c5e3b2c..f93a2600a8 100644 --- a/multinode-demo/common.sh +++ b/multinode-demo/common.sh @@ -93,6 +93,7 @@ solana_fullnode_config=$(solana_program fullnode-config) solana_fullnode_cuda=$(solana_program fullnode-cuda) solana_genesis=$(solana_program genesis) solana_keygen=$(solana_program keygen) +solana_ledger_tool=$(solana_program ledger-tool) export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info export RUST_BACKTRACE=1