Commit 070c0829 authored by Reto Da Forno's avatar Reto Da Forno
Browse files

new parameter added to config and server update script adjusted

parent 7479f884
...@@ -74,6 +74,7 @@ serialproxyscript = /home/flocklab/testmanagementserver/flocklab_serialproxy.py ...@@ -74,6 +74,7 @@ serialproxyscript = /home/flocklab/testmanagementserver/flocklab_serialproxy.py
default_tg_voltage = 3.3 ;Default voltage for targets if not specified in XML default_tg_voltage = 3.3 ;Default voltage for targets if not specified in XML
default_sampling_divider = 2 ;Default sampling divider for power profiling if not specified in XML default_sampling_divider = 2 ;Default sampling divider for power profiling if not specified in XML
archiver_waittime = 10 ;Wait time between calls to the archiver if the maximum number of archiver instances is reached archiver_waittime = 10 ;Wait time between calls to the archiver if the maximum number of archiver instances is reached
continue_on_error = 1 ;Whenever possible, try to run the test even if some observers fails to start it
; XML test configuration file settings ; XML test configuration file settings
[xml] [xml]
......
...@@ -9,7 +9,7 @@ echo "Going to update files on FlockLab server $HOST..." ...@@ -9,7 +9,7 @@ echo "Going to update files on FlockLab server $HOST..."
sleep 2 # give the user time to abort, just in case sleep 2 # give the user time to abort, just in case
# testmanagement server files # testmanagement server files
RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" testmanagementserver ${USER}@${HOST}: | grep '^<fc' | cut -d' ' -f2) RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" testmanagementserver/ ${USER}@${HOST}:testmanagementserver/ | grep '^<fc' | cut -d' ' -f2)
if [ -z "$RES" ]; then if [ -z "$RES" ]; then
echo "Testmanagement server files are up to date." echo "Testmanagement server files are up to date."
else else
...@@ -23,7 +23,7 @@ else ...@@ -23,7 +23,7 @@ else
fi fi
fi fi
# webserver files # webserver files
RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" webserver ${USER}@${HOST}: | grep '^<fc' | cut -d' ' -f2) RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" webserver/ ${USER}@${HOST}:webserver/ | grep '^<fc' | cut -d' ' -f2)
if [ -z "$RES" ]; then if [ -z "$RES" ]; then
echo "Webserver files are up to date." echo "Webserver files are up to date."
else else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment