From 71cc72d3c5e977355ebb0aa8bcb065a08207ec2f Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 7 Feb 2017 14:41:59 +0100 Subject: Parallelised merge, sth phase. --- test/scripts/light-system-test-start.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'test/scripts/light-system-test-start.sh') diff --git a/test/scripts/light-system-test-start.sh b/test/scripts/light-system-test-start.sh index 4520945..985a23c 100755 --- a/test/scripts/light-system-test-start.sh +++ b/test/scripts/light-system-test-start.sh @@ -14,8 +14,11 @@ start_node() { "exec ../bin/erl -boot ${node_app} -config ${node}" } -for node in ${ERLANGNODES}; do - start_node $(echo $node | tr ':' ' ') +for nodegroup in $SIGNINGNODES $MERGESECONDARYNODES $STORAGENODES $FRONTENDNODES; do + for node in $nodegroup; do + echo "starting $node" + start_node $(echo $node | tr ':' ' ') + done done for i in 1 2 3 4 5 6 7 8 9 10; do echo "waiting for system to start" @@ -37,3 +40,7 @@ for i in 1 2 3 4 5 6 7 8 9 10; do echo Not started: ${notstarted} fi done + +[ $# -gt 0 ] && [ "$1" = "initlog" ] && $top_srcdir/tools/initlog.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg + +start_node $(echo ${MERGEPRIMARYNODE} | tr ':' ' ') -- cgit v1.1