From 73a4e474f16bbbbf6c62e1de9a54cbbf008e021f Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 14 May 2019 17:26:59 -0400 Subject: [PATCH] System Test scripts: jenkins improvements --- .../system_test_scripts/spreader_simple_sanity.sh | 8 +++++--- .../spark_test/system_test_scripts/test_clip_limits.sh | 7 ++++--- .../spark_test/system_test_scripts/test_join_algo.sh | 4 ++-- .../system_test_scripts/test_position_limits.sh | 7 ++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh index 9c9ade42e..cc1deacfc 100644 --- a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh +++ b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh @@ -7,9 +7,11 @@ else sparkdata_dir=/sparkdata fi -rm -r $sparkdata_dir/data/databases/ > /dev/null +rm -r $sparkdata_dir/data/databases/ 2>/dev/null + +[ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { @@ -35,5 +37,5 @@ sleep 120 dotnet sparkcmd.dll test spreader_simple_sanity -kill $pid +pkill -P $$ mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_clip_limits.sh b/src/client/spark_test/system_test_scripts/test_clip_limits.sh index 8f3d3215e..da53d7f7a 100644 --- a/src/client/spark_test/system_test_scripts/test_clip_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_clip_limits.sh @@ -7,10 +7,11 @@ else sparkdata_dir=/sparkdata fi -rm -r $sparkdata_dir/data/databases/ > /dev/null +rm -r $sparkdata_dir/data/databases/ 2>/dev/null +[ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { @@ -35,5 +36,5 @@ sleep 120 dotnet sparkcmd.dll test test_clip_limits -kill $pid +pkill -P $$ mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_join_algo.sh b/src/client/spark_test/system_test_scripts/test_join_algo.sh index 775ee0b05..9e154eb72 100644 --- a/src/client/spark_test/system_test_scripts/test_join_algo.sh +++ b/src/client/spark_test/system_test_scripts/test_join_algo.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Stop script on NZEC -set -e +#set -e # the will allow sparkd to keep running if a test fails, preventing Jenkins from continuing # Stop script if unbound variable found (use ${var:-} if intentional) set -u @@ -146,6 +146,6 @@ if [ "$test_config_file_created" = true ]; then fi # Kill sparkd -kill $pid +pkill -P $$ say "Test has finished." diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index b31445a5b..9dcffd955 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -7,10 +7,11 @@ else sparkdata_dir=/sparkdata fi -rm -r $sparkdata_dir/data/databases/ > /dev/null +rm -r $sparkdata_dir/data/databases/ 2>/dev/null +[ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak 2>/dev/null -mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { @@ -35,5 +36,5 @@ echo "sleeping for 120 seconds..." sleep 120 dotnet sparkcmd.dll test test_position_limits -kill $pid +pkill -P $$ mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file