[GNUnet-SVN] r27039 - in gnunet-planetlab/gplmt: . contrib contrib/tasklists gplmt

[gnunet]

Author: wachs
Date: 2013-05-06 16:15:58 +0200 (Mon, 06 May 2013)
New Revision: 27039

Added:
   gnunet-planetlab/gplmt/gplmt.conf
Removed:
   gnunet-planetlab/gplmt/contrib/test.conf
Modified:
   gnunet-planetlab/gplmt/contrib/gnunet.conf
   gnunet-planetlab/gplmt/contrib/tasklists/delete_gnunet_logs.xml
   gnunet-planetlab/gplmt/contrib/tasklists/stop_buildslaves.xml
   gnunet-planetlab/gplmt/gplmt/Configuration.py
Log:
latest changes


Modified: gnunet-planetlab/gplmt/contrib/gnunet.conf
===================================================================
--- gnunet-planetlab/gplmt/contrib/gnunet.conf  2013-05-06 13:01:36 UTC (rev 
27038)
+++ gnunet-planetlab/gplmt/contrib/gnunet.conf  2013-05-06 14:15:58 UTC (rev 
27039)
@@ -14,4 +14,4 @@
 [arm]
 DEFAULTSERVICES = topology hostlist dht nse mesh fs gns 
 #sysmon
-
+GLOBAL_POSTFIX = -l /home/tumple_gnunet/logs/{}-logs -L WARNING

Modified: gnunet-planetlab/gplmt/contrib/tasklists/delete_gnunet_logs.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/delete_gnunet_logs.xml     
2013-05-06 13:01:36 UTC (rev 27038)
+++ gnunet-planetlab/gplmt/contrib/tasklists/delete_gnunet_logs.xml     
2013-05-06 14:15:58 UTC (rev 27039)
@@ -11,7 +11,7 @@
        </run> 
                <run id="2" name="delete logs" enabled="true">
                <command>rm -rf </command>
-               <arguments>logs</arguments> 
+               <arguments>logs/*</arguments> 
         <timeout>60</timeout>
         <expected_return_code>0</expected_return_code>
         <expected_output></expected_output>

Modified: gnunet-planetlab/gplmt/contrib/tasklists/stop_buildslaves.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/stop_buildslaves.xml       
2013-05-06 13:01:36 UTC (rev 27038)
+++ gnunet-planetlab/gplmt/contrib/tasklists/stop_buildslaves.xml       
2013-05-06 14:15:58 UTC (rev 27039)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tasklist name="Start buildslaves on Planetlab nodes" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
+<tasklist name="Stop buildslaves on Planetlab nodes" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
        <run id="0" name="check peer">
                <!-- Check if peer is working -->
         <command>sudo date</command> 

Deleted: gnunet-planetlab/gplmt/contrib/test.conf
===================================================================
--- gnunet-planetlab/gplmt/contrib/test.conf    2013-05-06 13:01:36 UTC (rev 
27038)
+++ gnunet-planetlab/gplmt/contrib/test.conf    2013-05-06 14:15:58 UTC (rev 
27039)
@@ -1,55 +0,0 @@
-[gplmt]
-#nodes = contrib/test_node.nodes
-# Which notification mechanism to use: 
-# simple: print messages to stdout
-#notification = simple
-notification = result
-tasks = contrib/tasklists/check_node.xml
-
-[planetlab]
-slice = tumple_gnunet
-# Configuration for Planetlab API
-# Use PlanetLab nodes instead of nodes file
-use_pl_nodes = yes
-# PlanetLab Europe
-api_url = https://www.planet-lab.eu/PLCAPI/
-# Planetlab
-#api_url = https://www.planet-lab.org/PLCAPI/
-
-# Planetlab username
-username = <pl_username>
-# Planetlab password
-password = <pl_pw>
-
-[ssh]
-# Order of ssh authentication:
-#
-# The ssh_keyfile_filename passed in (if any)
-# Any key we can find through an SSH agent
-# Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/
-# Plain password auth, if a ssh_password was given
-#ssh_keyfile = <keyfile>
-ssh_password = <password>
-# protocoll for put get operations (Planetlab does not support SFTP)
-ssh_transfer = scp
-#ssh_transfer = sftp
-# Use system's SSH "known hosts" file
-ssh_use_known_hosts = yes
-# Add node hostkeys automatically
-add_unkown_hostkeys = yes
-
-[buildbot]
-# configuration template
-template = ../../gplmt/contrib/master_template.cfg
-result_task_file = result.tasks
-result_cfg = result.cfg
-buildbot_command = buildslave create-slave ./bot
-master = gnunet.org:9990
-slaveport = 9990
-webport = 8011
-# set to "yes" to allow force building
-force_enable = no
-force_user = <force_user>
-force_pw = <force_pw>
-
-

Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-05-06 13:01:36 UTC 
(rev 27038)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-05-06 14:15:58 UTC 
(rev 27039)
@@ -89,8 +89,7 @@
             try: 
                 self.pl_slicename = config.get("planetlab", "slice")
             except ConfigParser.NoOptionError as e:
-                print "Error parsing configuration: " + str (e)
-                return False
+                pass
             # optional values
             try:
                 self.pl_use_nodes = config.getboolean ("planetlab", 
"use_pl_nodes")

Copied: gnunet-planetlab/gplmt/gplmt.conf (from rev 26564, 
gnunet-planetlab/gplmt/contrib/test.conf)
===================================================================
--- gnunet-planetlab/gplmt/gplmt.conf                           (rev 0)
+++ gnunet-planetlab/gplmt/gplmt.conf   2013-05-06 14:15:58 UTC (rev 27039)
@@ -0,0 +1,55 @@
+[gplmt]
+#nodes = contrib/test_node.nodes
+# Which notification mechanism to use: 
+# simple: print messages to stdout
+#notification = simple
+notification = result
+tasks = contrib/tasklists/check_node.xml
+
+[planetlab]
+slice = tumple_gnunet
+# Configuration for Planetlab API
+# Use PlanetLab nodes instead of nodes file
+use_pl_nodes = yes
+# PlanetLab Europe
+api_url = https://www.planet-lab.eu/PLCAPI/
+# Planetlab
+#api_url = https://www.planet-lab.org/PLCAPI/
+
+# Planetlab username
+username = <pl_username>
+# Planetlab password
+password = <pl_pw>
+
+[ssh]
+# Order of ssh authentication:
+#
+# The ssh_keyfile_filename passed in (if any)
+# Any key we can find through an SSH agent
+# Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/
+# Plain password auth, if a ssh_password was given
+#ssh_keyfile = <keyfile>
+ssh_password = <password>
+# protocoll for put get operations (Planetlab does not support SFTP)
+ssh_transfer = scp
+#ssh_transfer = sftp
+# Use system's SSH "known hosts" file
+ssh_use_known_hosts = yes
+# Add node hostkeys automatically
+add_unkown_hostkeys = yes
+
+[buildbot]
+# configuration template
+template = ../../gplmt/contrib/master_template.cfg
+result_task_file = result.tasks
+result_cfg = result.cfg
+buildbot_command = buildslave create-slave ./bot
+master = gnunet.org:9990
+slaveport = 9990
+webport = 8011
+# set to "yes" to allow force building
+force_enable = no
+force_user = <force_user>
+force_pw = <force_pw>
+
+