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

[gnunet]

Author: wachs
Date: 2012-07-23 11:03:04 +0200 (Mon, 23 Jul 2012)
New Revision: 22832

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

Modified: gnunet-planetlab/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/Worker.py    2012-07-22 22:01:56 UTC (rev 22831)
+++ gnunet-planetlab/gplmt/Worker.py    2012-07-23 09:03:04 UTC (rev 22832)
@@ -58,20 +58,25 @@
         exec_time = 0
         result = Tasks.Taskresult.success
         
-        stdout = channel.makefile("rb")
-        stderr = channel.makefile_stderr("rb")
-        while ((not channel.exit_status_ready()) and (exec_time < timeout)):
-            time.sleep(1)
-            exec_time += 1
-        if (exec_time < timeout):
-
-        
-            stdout_data = stdout.readlines()
-            stderr_data = stderr.readlines()
-            exit_status = channel.recv_exit_status()
-        else:
-            g_logger.log (self.node + " : Task '"+ task.name + "' had timeout 
after " +str (exec_time)+ " seconds")
-            result = Tasks.Taskresult.timeout
+        try: 
+            stdout = channel.makefile("rb")
+            stderr = channel.makefile_stderr("rb")
+            verbose_ssh = True
+            while ((not channel.exit_status_ready()) and (exec_time < 
timeout)):
+                time.sleep(1)
+                exec_time += 1
+            if ((exec_time < timeout) or (verbose_ssh == True)):  
+                stdout_data = stdout.readlines()
+                stderr_data = stderr.readlines()
+                exit_status = channel.recv_exit_status()
+            if (verbose_ssh == True):
+                print stdout_data
+                print stderr_data
+            else:
+                g_logger.log (self.node + " : Task '"+ task.name + "' had 
timeout after " +str (exec_time)+ " seconds")
+                result = Tasks.Taskresult.timeout
+        except socket.timeout as e:
+            g_logger.log (self.node + " : Task '"+ task.name + "' had timeout 
after " +str (exec_time)+ " seconds: " + str(e))
             
         if (result == Tasks.Taskresult.success):
             if (task.expected_return_code != -1):                    

Modified: gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml    2012-07-22 22:01:56 UTC 
(rev 22831)
+++ gnunet-planetlab/gplmt/contrib/deploy_gnunet.xml    2012-07-23 09:03:04 UTC 
(rev 22832)
@@ -346,7 +346,7 @@
       </run>
     </sequence>
 
-     <sequence enabled="true">
+     <sequence enabled="false">
      <!-- Install libcurl -->
       <run id="1" name="Download libcurl" enabled="true">
             <command>mkdir /tmp/libcurl; cd /tmp/libcurl; wget </command> 
@@ -375,7 +375,7 @@
       <run id="1" name="Install libcurl">
             <command>cd /tmp/libcurl/curl-7.23.1; sudo make install</command>
             <arguments> </arguments> 
-            <timeout>360</timeout> 
+            <timeout>480</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -388,11 +388,11 @@
             <expected_output></expected_output>
             <stop_on_fail>false</stop_on_fail>
       </run>
-    </sequence>         
+    </sequence>
 
-     <sequence enabled="false">
+     <sequence enabled="true">
      <!-- Install libnettle -->
-      <run id="1" name="Download libnettle" enabled="true">
+      <run id="1" name="Download libnettle" enabled="false">
             <command>mkdir /tmp/libnettle; cd /tmp/libnettle; wget </command> 
             
<arguments>http://www.lysator.liu.se/~nisse/archive/nettle-2.4.tar.gz</arguments>
 
             <timeout>120</timeout> 
@@ -400,7 +400,7 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-      <run id="1" name="Unpack libnettle" enabled="true">
+      <run id="1" name="Unpack libnettle" enabled="false">
             <command>cd /tmp/libnettle; tar -xzvf</command> 
             <arguments>nettle-2.4.tar.gz</arguments> 
             <timeout>120</timeout> 
@@ -408,7 +408,7 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-      <run id="1" name="Configure libnettle" enabled="true">
+      <run id="1" name="Configure libnettle" enabled="false">
             <command>cd /tmp/libnettle/nettle-2.4; ./configure </command> 
             <arguments>--prefix=/usr --enable-shared</arguments> 
             <timeout>120</timeout> 
@@ -475,8 +475,184 @@
             <expected_output></expected_output>
             <stop_on_fail>false</stop_on_fail>
       </run>
-    </sequence>         
-                   
+    </sequence>
+     <sequence enabled="false">
+     <!-- Install gnutls -->
+      <run id="1" name="Download libunistring" enabled="true">
+            <command>mkdir /tmp/gnutls; cd /tmp/libunistring; wget </command> 
+            
<arguments>http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.3.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 libunistring" enabled="true">
+            <command>cd /tmp/libunistring; tar -xzvf</command> 
+            <arguments>libunistring-0.9.3.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 libunistring" enabled="true">
+            <command>cd /tmp/libunistring/libunistring-0.9.3; ./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 libunistring">
+            <command>cd /tmp/libunistring/libunistring-0.9.3; 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="libunistring clean up">
+            <command>sudo rm -rf /tmp/libunistring</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>
+
+  <sequence enabled="false">
+     <!-- Install libextractor from svn -->
+      <run id="1" name="Download Extractor" enabled="true">
+            <command>svn checkout</command> 
+            <arguments> https://gnunet.org/svn/Extractor</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="Bootstrap Extractor" enabled="true">
+            <command>cd Extractor; ./bootstrap</command> 
+            <arguments></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 Extractor" enabled="true">
+            <command>cd Extractor; ./configure </command> 
+            <arguments></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 Extractor">
+            <command>cd Extractor; sudo make install</command>
+            <arguments> </arguments> 
+            <timeout>480</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>
+  <sequence enabled="false">
+     <!-- Install libextractor from svn -->
+      <run id="1" name="Download libmicrohttpd" enabled="true">
+            <command>svn checkout</command> 
+            <arguments> https://gnunet.org/svn/libmicrohttpd</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="Bootstrap libmicrohttpd" enabled="true">
+            <command>cd libmicrohttpd; ./bootstrap</command> 
+            <arguments></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 libmicrohttpd" enabled="true">
+            <command>cd libmicrohttpd; ./configure </command> 
+            <arguments>--with-gnutls=/usr --enable-messages 
--enable-curl</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 libmicrohttpd">
+            <command>cd libmicrohttpd; sudo make install</command>
+            <arguments> </arguments> 
+            <timeout>480</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>        
        
+       <sequence enabled="false">
+     <!-- Install GNUnet from svn -->
+      <run id="1" name="Download GNUnet" enabled="true">
+            <command>svn checkout</command> 
+            <arguments> https://gnunet.org/svn/gnunet</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="Bootstrap GNUnet" enabled="true">
+            <command>cd gnunet; ./bootstrap</command> 
+            <arguments></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 GNUnet" enabled="true">
+            <command>cd gnunet; ./configure </command> 
+            <arguments>--prefix=$HOME/gnbuild --with-extractor=/usr 
--enable-logging=verbose</arguments> 
+            <timeout>720</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 GNUnet">
+            <command>cd gnunet; make install</command>
+            <arguments> </arguments> 
+            <timeout>720</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>        
+       <sequence enabled="false">
+     <!-- Postinstallation setup -->
+      <run id="1" name="Create GNUnet directory" enabled="true">
+            <command>mkdir .gnunet; touch .gnunet/gnunet.conf</command> 
+            <arguments></arguments> 
+            <timeout>20</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Set GNUNET_PREFIX" enabled="true">
+            <command>echo -e "export GNUNET_PREFIX=$HOME/gnbuild \n" >> 
~/.bashrc</command> 
+            <arguments></arguments> 
+            <timeout>20</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 GNUnet" enabled="true">
+            <command>echo -e "export PATH=$PATH:$GNUNET_PREFIX/bin \n" >> 
~/.bashrc</command> 
+            <arguments></arguments> 
+            <timeout>20</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>            
+       
 </tasklist>