Commit 7479f884 authored by Reto Da Forno's avatar Reto Da Forno
Browse files

'#' in results files removed, script added to update server software

parent 21964455
......@@ -925,17 +925,17 @@ def main(argv):
testresultsfile_dict[service] = (path, lock)
# Create file and write header:
if service == 'errorlog':
header = '# timestamp,observer_id,node_id,errormessage\n'
header = 'timestamp,observer_id,node_id,errormessage\n'
elif service == 'gpiotracing':
header = 'observer_id,node_id,pin_name,# timestamp,value\n'
header = 'timestamp,observer_id,node_id,pin_name,value\n'
elif service == 'gpioactuation':
header = '# timestamp_planned,timestamp_executed,observer_id,node_id,pin_name,value\n'
header = 'timestamp_planned,timestamp_executed,observer_id,node_id,pin_name,value\n'
elif service == 'powerprofiling':
header = 'timestamp,observer_id,node_id,I1,V1,V2\n'
elif service == 'serial':
header = '# timestamp,observer_id,node_id,direction,output\n'
header = 'timestamp,observer_id,node_id,direction,output\n'
elif service == 'powerprofilingstats':
header = '# observer_id,node_id,mean_mA\n'
header = 'observer_id,node_id,mean_mA\n'
lock.acquire()
f = open(path, 'w')
f.write(header)
......
#!/bin/bash
#
# FlockLab2 server update script.
USER="flocklab"
HOST="flocklab-dev-server"
echo "Going to update files on FlockLab server $HOST..."
sleep 2 # give the user time to abort, just in case
# testmanagement server files
RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" testmanagementserver ${USER}@${HOST}: | grep '^<fc' | cut -d' ' -f2)
if [ -z "$RES" ]; then
echo "Testmanagement server files are up to date."
else
printf "Updating testmanagement server files... "
rsync -a -q -z -c --exclude=".git" -e "ssh -q" testmanagementserver ${USER}@${HOST}:
if [ $? -ne 0 ]; then
printf "Failed to copy files!\n"
continue
else
printf "done.\n"
fi
fi
# webserver files
RES=$(rsync -a -z -c -i --dry-run --exclude=".git" -e "ssh -q" webserver ${USER}@${HOST}: | grep '^<fc' | cut -d' ' -f2)
if [ -z "$RES" ]; then
echo "Webserver files are up to date."
else
printf "Updating webserver files..."
rsync -a -q -z -c --exclude=".git" -e "ssh -q" webserver ${USER}@${HOST}:
if [ $? -ne 0 ]; then
printf "failed to copy repository files!\n"
continue
else
printf "done.\n"
fi
fi
......@@ -333,7 +333,7 @@
<xs:simpleType name="obsIdType">
<xs:restriction base="xs:string">
<xs:pattern value="2|02|ALL"/>
<xs:pattern value="2|02|4|04|5|05|6|06|7|07|8|08|9|09|10|11|12|ALL"/>
</xs:restriction>
</xs:simpleType>
......
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