System Test scripts: jenkins improvements
This commit is contained in:
1 parent
4e30591837
commit
73a4e474f1
4 files changed
+15
-11
No files matched your search
@@ -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
|
||||
@@ -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
|
||||
@@ -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."
|
||||
@@ -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
|
||||
Reference in new issue
Block a user