gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move some common scripts from multinode-demo/ to scripts/

Browse Source
This commit is contained in:
Michael Vines
2018-08-27 10:23:22 -07:00
parent cd0db7842c
commit bd5c6158ae
13 changed files with 106 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ci/localnet-sanity.sh
View File

@ -6,9 +6,9 @@
cd "$(dirname "$0")"/..
source ci/upload_ci_artifact.sh
source multinode-demo/common.sh
source scripts/configure-metrics.sh
./multinode-demo/setup.sh
multinode-demo/setup.sh
backgroundCommands="drone leader validator validator-x"
pids=()
@ -16,7 +16,7 @@ pids=()
for cmd in $backgroundCommands; do
echo "--- Start $cmd"
rm -f log-"$cmd".txt
./multinode-demo/"$cmd".sh > log-"$cmd".txt 2>&1 &
multinode-demo/"$cmd".sh > log-"$cmd".txt 2>&1 &
declare pid=$!
pids+=("$pid")
echo "pid: $pid"
@ -67,11 +67,11 @@ flag_error() {
# set -x
# multinode-demo/test/wallet-sanity.sh
# ) || flag_error
#
#
# echo "--- Node count"
# (
# set -x
# ./multinode-demo/client.sh "$PWD" 3 -c --addr 127.0.0.1
# multinode-demo/client.sh "$PWD" 3 -c --addr 127.0.0.1
# ) || flag_error
killBackgroundCommands
@ -79,6 +79,7 @@ killBackgroundCommands
echo "--- Ledger verification"
(
set -x
source multinode-demo/common.sh
$solana_ledger_tool --ledger "$SOLANA_CONFIG_DIR"/ledger verify
) || flag_error

2
ci/testnet-deploy.sh
View File

@ -6,7 +6,7 @@
# with GCP and has sufficient permission.
#
here=$(dirname "$0")
metrics_write_datapoint="$here"/../multinode-demo/metrics_write_datapoint.sh
metrics_write_datapoint="$here"/../scripts/metrics-write-datapoint.sh
# TODO: Switch over to rolling updates
ROLLING_UPDATE=false

4
ci/testnet-sanity.sh
View File

@ -4,7 +4,7 @@
#
cd "$(dirname "$0")/.."
source multinode-demo/common.sh
source scripts/metrics-write-datapoint.sh
NET_URL=$1
if [[ -z $NET_URL ]]; then
@ -45,7 +45,7 @@ echo "--- $NET_URL: node count"
if [[ -n "$USE_SNAP" ]]; then
# TODO: Merge client.sh functionality into solana-bench-tps proper and
# remove this USE_SNAP case
cmd=$solana_bench_tps
cmd=solana.bench-tps
else
cmd=multinode-demo/client.sh
fi