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

[gnunet]

Author: wachs
Date: 2012-07-20 17:04:26 +0200 (Fri, 20 Jul 2012)
New Revision: 22801

Modified:
   gnunet-planetlab/gplmt/TODO
   gnunet-planetlab/gplmt/Tasks.py
   gnunet-planetlab/gplmt/Worker.py
   gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml
Log:
- changes

Modified: gnunet-planetlab/gplmt/TODO
===================================================================
--- gnunet-planetlab/gplmt/TODO 2012-07-20 15:03:54 UTC (rev 22800)
+++ gnunet-planetlab/gplmt/TODO 2012-07-20 15:04:26 UTC (rev 22801)
@@ -8,6 +8,10 @@
 - Monitor mode
 - Console mode
 
+Known Bugs 
+===============
+- SFTP does not work in PlanetLab nodes
+
 Implemented in
 ===============
 

Modified: gnunet-planetlab/gplmt/Tasks.py
===================================================================
--- gnunet-planetlab/gplmt/Tasks.py     2012-07-20 15:03:54 UTC (rev 22800)
+++ gnunet-planetlab/gplmt/Tasks.py     2012-07-20 15:04:26 UTC (rev 22801)
@@ -57,7 +57,7 @@
         self.command = ""
         self.arguments = ""
         self.timeout = 0
-        self.expected_return_code = 0
+        self.expected_return_code = -1
         self.expected_output = None
         self.stop_on_fail = False
         self.set = None
@@ -217,7 +217,7 @@
         try:
             xsv.parseAndValidate (self.filename)
         except xsv.xsvalErrorHandler.XsvalError as e:
-            print "File '" + self.filename + "' does not validate against 
schema: " + str(e)
+            print "File '" + self.filename + "' does not validate against 
schema: \n" + str(e)
             return False
         
         try:

Modified: gnunet-planetlab/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/Worker.py    2012-07-20 15:03:54 UTC (rev 22800)
+++ gnunet-planetlab/gplmt/Worker.py    2012-07-20 15:04:26 UTC (rev 22801)
@@ -73,14 +73,15 @@
             g_logger.log (self.node + " : Task '"+ task.name + "' had timeout 
after " +str (exec_time)+ " seconds")
             result = Tasks.Taskresult.timeout
             
-        if (result == Tasks.Taskresult.success):                    
-            if (exit_status != task.expected_return_code):
-                g_logger.log (self.node + " : Task '"+ task.name + "' 
completed, but exit code " +str(exit_status)+ " was not as expected " + 
str(task.expected_return_code))
-                g_logger.log (stdout_data)
-                g_logger.log (stderr_data)
-                result = Tasks.Taskresult.return_value_did_not_match
-            else:
-                g_logger.log (self.node + " : Task '"+ task.name + "' 
completed, exit code " +str(exit_status)+ " was as expected " + 
str(task.expected_return_code))
+        if (result == Tasks.Taskresult.success):
+            if (task.expected_return_code != -1):                    
+                if (exit_status != task.expected_return_code):
+                    g_logger.log (self.node + " : Task '"+ task.name + "' 
completed, but exit code " +str(exit_status)+ " was not as expected " + 
str(task.expected_return_code))
+                    g_logger.log (stdout_data)
+                    g_logger.log (stderr_data)
+                    result = Tasks.Taskresult.return_value_did_not_match
+                else:
+                    g_logger.log (self.node + " : Task '"+ task.name + "' 
completed, exit code " +str(exit_status)+ " was as expected " + 
str(task.expected_return_code))
             
             if (task.expected_output != None):
                 output_contained = False

Modified: gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml    2012-07-20 15:03:54 UTC 
(rev 22800)
+++ gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml    2012-07-20 15:04:26 UTC 
(rev 22801)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tasklist name="Deploy GNUnet" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
-       <!-- Check if peer is up and sudo working -->
+       
        <run id="0" name="check peer">
+               <!-- Check if peer is working -->
         <command>sudo date</command> 
         <arguments></arguments> 
         <timeout>10</timeout>
@@ -9,95 +10,254 @@
         <expected_output>2012</expected_output>
         <stop_on_fail>true</stop_on_fail>
        </run> 
+
+
+       <sequence enabled="false">
+       <!-- Install dependencies -->
+    <run id="1" name="Install dependencies with yum : make">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>make</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Install dependencies with yum : gcc">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>gcc</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Install dependencies with yum : autoconf">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>autoconf</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Install dependencies with yum : automake">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>automake</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Install dependencies with yum : texinfo">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>texinfo</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Install dependencies with yum : m4">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>m4</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>     
+    <run id="1" name="Install dependencies with yum : gettext">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>texinfo</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>             
+    <run id="1" name="Install dependencies with yum : gettext-devel">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>gettext-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>             
+    <run id="1" name="Install dependencies with yum : zlib-devel">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>zlib-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>             
+    <run id="1" name="Install dependencies with yum : sqlite-devel">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>sqlite-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>             
+    <run id="1" name="Install dependencies with yum : gmp-devel">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>gmp-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+       </sequence>
+
+       <sequence enabled="false">
+       <!-- Remove too old packages -->
+    <run id="1" name="Remove outdated packages: libgcrypt">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgcrypt</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error-devel">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+       </sequence>
        
-       <!-- Check if peer is working -->
-       <run id="1" name="Install dependencies with yum : make">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>make</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-       <run id="1" name="Install dependencies with yum : gcc">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>gcc</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-       <run id="1" name="Install dependencies with yum : autoconf">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>autoconf</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-       <run id="1" name="Install dependencies with yum : automake">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>automake</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-       <run id="1" name="Install dependencies with yum : texinfo">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>texinfo</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-       <run id="1" name="Install dependencies with yum : m4">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>m4</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>  
-       <run id="1" name="Install dependencies with yum : gettext">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>texinfo</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>          
-       <run id="1" name="Install dependencies with yum : gettext-devel">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>gettext-devel</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>          
-       <run id="1" name="Install dependencies with yum : zlib-devel">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>zlib-devel</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>          
-       <run id="1" name="Install dependencies with yum : sqlite-devel">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>sqlite-devel</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>          
-       <run id="1" name="Install dependencies with yum : gmp-devel">
-        <command>sudo yum -y -t --nogpgcheck install</command> 
-        <arguments>gmp-devel</arguments> 
-        <timeout>60</timeout> 
-        <expected_return_code>0</expected_return_code>
-        <expected_output></expected_output>
-        <stop_on_fail>false</stop_on_fail>
-       </run>
-                       
+  <sequence enabled="false">
+        <!-- Remove too old packages -->
+    <run id="1" name="Remove outdated packages: libgcrypt">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgcrypt</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error-devel">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+       </sequence>
+       
+  <sequence enabled="false">
+        <!-- Remove too old packages -->
+    <run id="1" name="Remove outdated packages: libgcrypt">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgcrypt</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error-devel">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error-devel</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Remove outdated packages: libgpg-error">
+          <command>sudo rpm -e --nodeps </command> 
+          <arguments>libgpg-error</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+       </sequence>
+       
+         <sequence enabled="false">
+        <!-- Setup subversion -->
+    <run id="1" name="Install dependencies with yum : subversion">
+          <command>sudo yum -y -t --nogpgcheck install</command> 
+          <arguments>subversion</arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>0</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <run id="1" name="Create subversion folders">
+          <command>mkdir ~/.subversion; mkdir ~/.subversion/auth; mkdir 
~/.subversion/auth/svn.ssl.server </command> 
+          <arguments></arguments> 
+          <timeout>60</timeout> 
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+    </run>
+    <put id="0" name="Copy GNUnet certificate to node">
+                 <source>contrib/gnunet-svn-cert</source>
+                 
<destination>.subversion/auth/svn.ssl.server/2bd0c10624fe8b217987bb45f1ec55bf</destination>
+      <stop_on_fail>false</stop_on_fail>
+       </put> 
+       </sequence>
+       
+         <sequence enabled="true">
+        <!-- Install depencies from source -->
+      <sequence enabled="false">
+     <!-- Install libtool -->
+      <run id="1" name="Download libtool" enabled="false">
+            <command>mkdir /tmp/libtool; cd /tmp/libtool; wget </command> 
+            
<arguments>http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz</arguments> 
+            <timeout>120</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Unpack libtool" enabled="false">
+            <command>cd /tmp/libtool; tar xfvz </command> 
+            <arguments>libtool-2.4.2.tar.gz</arguments> 
+            <timeout>120</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Configure libtool" enabled="false">
+            <command>cd /tmp/libtool/libtool-2.4.2; ./configure </command> 
+            <arguments>--prefix=/usr </arguments> 
+            <timeout>120</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Install libtool">
+            <command>cd /tmp/libtool/libtool-2.4.2; sudo make install</command>
+            <arguments> </arguments> 
+            <timeout>360</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Libtool clean up">
+            <command>rm -rf /tmp/libtool</command>
+            <arguments> </arguments> 
+            <timeout>10</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>false</stop_on_fail>
+      </run>
+    </sequence>
+       </sequence>
+       
 </tasklist>