[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23282 - in gnunet-planetlab/gplmt: . contrib/tasklists gpl
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23282 - in gnunet-planetlab/gplmt: . contrib/tasklists gplmt |
Date: |
Fri, 17 Aug 2012 13:07:42 +0200 |
Author: wachs
Date: 2012-08-17 13:07:42 +0200 (Fri, 17 Aug 2012)
New Revision: 23282
Modified:
gnunet-planetlab/gplmt/contrib/tasklists/setup_buildslaves.xml
gnunet-planetlab/gplmt/gplmt.py
gnunet-planetlab/gplmt/gplmt/Tasks.py
gnunet-planetlab/gplmt/gplmt/Util.py
Log:
- changes
Modified: gnunet-planetlab/gplmt/contrib/tasklists/setup_buildslaves.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/setup_buildslaves.xml
2012-08-17 10:45:13 UTC (rev 23281)
+++ gnunet-planetlab/gplmt/contrib/tasklists/setup_buildslaves.xml
2012-08-17 11:07:42 UTC (rev 23282)
@@ -7,11 +7,11 @@
<timeout>10</timeout>
<expected_return_code>0</expected_return_code>
<expected_output>2012</expected_output>
- <stop_on_fail>true</stop_on_fail>
+ <stop_on_fail>false</stop_on_fail>
</run>
<run id="2" name="Delete old configuration">
- <command>rm bot/buildbot.tac</command>
+ <command>rm -rf bot</command>
<arguments></arguments>
<timeout>10</timeout>
<expected_return_code>0</expected_return_code>
@@ -20,14 +20,14 @@
</run>
<run_per_host id="1" name="setup buildslave">
-
<command_file>contrib/tasklists/setup_buildslave.cmds</command_file>
+
<command_file>/home/mwachs/repositories/pltestbed/slave_deployment_cmds</command_file>
<output_prefix>contrib/tests/result_</output_prefix>
<timeout>30</timeout>
<expected_return_code>0</expected_return_code>
<expected_output></expected_output>
<stop_on_fail>true</stop_on_fail>
</run_per_host>
- <run id="2" name="start buildslave" enabled="true">
+ <run id="2" name="start buildslave">
<command>buildslave start ./bot</command>
<arguments></arguments>
<timeout>60</timeout>
Modified: gnunet-planetlab/gplmt/gplmt/Tasks.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Tasks.py 2012-08-17 10:45:13 UTC (rev
23281)
+++ gnunet-planetlab/gplmt/gplmt/Tasks.py 2012-08-17 11:07:42 UTC (rev
23282)
@@ -22,7 +22,9 @@
#
# Nodes
try:
+ from Util import handle_filename
import sys
+ import os
from xml.parsers import expat
from minixsv import pyxsval as xsv
from elementtree import ElementTree
@@ -31,6 +33,7 @@
except ImportError:
print "That's a bug! please check README"
sys.exit(1)
+
glogger = None
@@ -151,7 +154,12 @@
for child in elem:
if ((child.tag == "command_file") and (child.text != None)):
- t.command_file = child.text
+ t.command_file = handle_filename(child.text)
+ if (False == os.path.exists(t.command_file)):
+ print "Command file '" ++ "' not existing"
+ sys.exit()
+ return None
+
if ((child.tag == "output_prefix") and (child.text != None)):
t.output_prefix = child.text
if ((child.tag == "command") and (child.text != None)):
Modified: gnunet-planetlab/gplmt/gplmt/Util.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Util.py 2012-08-17 10:45:13 UTC (rev
23281)
+++ gnunet-planetlab/gplmt/gplmt/Util.py 2012-08-17 11:07:42 UTC (rev
23282)
@@ -21,7 +21,13 @@
# GNUnet Planetlab deployment and automation toolset
#
# Utilities
+import os
+class Util:
+ def handle_filename (self, f):
+ f = os.path.expanduser(f)
+ return f
+
class Logger:
def __init__(self, verbose):
@@ -32,4 +38,5 @@
def log (self, message):
global main
if (True == self.verbose):
- print (message)
\ No newline at end of file
+ print (message)
+
\ No newline at end of file
Modified: gnunet-planetlab/gplmt/gplmt.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt.py 2012-08-17 10:45:13 UTC (rev 23281)
+++ gnunet-planetlab/gplmt/gplmt.py 2012-08-17 11:07:42 UTC (rev 23282)
@@ -41,6 +41,7 @@
minixsv_loaded = False
try:
+ from Util import handle_filename
import gplmt.Util as Util
import gplmt.Configuration as Configuration
import gplmt.Nodes as Nodes
@@ -87,13 +88,13 @@
usage()
sys.exit()
elif o in ("-c", "--config"):
- main.config_file = a
+ main.config_file = handle_filename(a)
elif o in ("-H", "--host"):
main.single_host = a
elif o in ("-n", "--nodes"):
- main.nodes_file = a
+ main.nodes_file = handle_filename(a)
elif o in ("-t", "--tasks"):
- main.tasks_file = a
+ main.tasks_file = handle_filename(a)
elif o in ("-a", "--all"):
main.pl_use_nodes = True
elif o in ("-p", "--password"):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23282 - in gnunet-planetlab/gplmt: . contrib/tasklists gplmt,
gnunet <=