Merge lp:~pwlars/lava-dispatcher/magma-merges into lp:lava-dispatcher

[Paul Larson]

Updates trunk with the important bits of what is actually running
currently. A few workarounds still exist here, but bugs exist for them
in lp to track them.

=== modified file 'lava/dispatcher/__init__.py'
--- lava/dispatcher/__init__.py	2011-04-29 18:16:01 +0000
+++ lava/dispatcher/__init__.py	2011-05-20 22:53:40 +0000
@@ -80,3 +80,7 @@
 
     def get_metadata(self):
         return self.metadata
+
+    def get_test_run(self):
+        self.add_result('job_complete', self.job_status)
+        return self._test_run
 
=== modified file 'lava/dispatcher/actions/abrek.py'
--- lava/dispatcher/actions/abrek.py	2011-04-29 17:05:24 +0000
+++ lava/dispatcher/actions/abrek.py	2011-05-20 22:53:40 +0000
@@ -20,7 +20,7 @@
     """
     abrek test tool deployment to test image rootfs by chroot
     """
-    def run(self, tests):
+    def run(self, tests, timeout=2400):
         client = self.client
         #Make sure in master image
         #, or exception can be caught and do boot_master_image()
@@ -65,7 +65,7 @@
         try:
             client.run_shell_command(
                 'chroot /mnt/root abrek help',
-                response = "list-tests", timeout = 10)
+                response = "list-tests")
         except:
             raise OperationFailed("abrek deployment failed")
 
 
=== modified file 'lava/dispatcher/actions/boot_control.py'
--- lava/dispatcher/actions/boot_control.py	2011-04-29 17:05:24 +0000
+++ lava/dispatcher/actions/boot_control.py	2011-05-20 22:53:40 +0000
@@ -8,7 +8,14 @@
         client = self.client
         #Workaround for commands coming too quickly at this point
         client.proc.sendline("")
-        client.boot_linaro_image()
+        status = 'pass'
+        try:
+            client.boot_linaro_image()
+        except:
+            status = 'fail'
+            raise
+        finally:
+            self.context.test_data.add_result("boot_image", status)
 
 class cmd_boot_master_image(BaseAction):
     """ Call client code to boot to the master image
 
=== modified file 'lava/dispatcher/actions/launch_control.py'
--- lava/dispatcher/actions/launch_control.py	2011-05-02 22:20:43 +0000
+++ lava/dispatcher/actions/launch_control.py	2011-05-20 22:53:40 +0000
@@ -4,6 +4,7 @@
 from lava.dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, LAVA_SERVER_IP
 import socket
 from threading import Thread
+import time
 import xmlrpclib
 
 class cmd_submit_results(BaseAction):
@@ -45,6 +46,9 @@
 
         t = ResultUploader()
         t.start()
+        #XXX: Odd problem where we sometimes get stuck here.  This is just
+        #     a hacky workaround to see if it's a race
+        time.sleep(60)
         client.run_shell_command(
             'cat bundle.lst |nc %s %d' % (LAVA_SERVER_IP, t.get_port()),
             response = MASTER_STR)
@@ -55,6 +59,9 @@
         for bundle in bundle_list:
             t = ResultUploader()
             t.start()
+            #XXX: Odd problem where we sometimes get stuck here.  This is just
+            #     a hacky workaround to see if it's a race
+            time.sleep(60)
             client.run_shell_command(
                 'cat /tmp/%s/%s | nc %s %s' % (LAVA_RESULT_DIR, bundle,
                     LAVA_SERVER_IP, t.get_port()),
@@ -64,16 +71,25 @@
             self.all_bundles.append(json.loads(content))
 
         main_bundle = self.combine_bundles()
-        srv.put(main_bundle, 'lava-dispatcher.bundle', stream)
+        main_bundle['test_runs'].append(self.context.test_data.get_test_run())
+        for test_run in main_bundle['test_runs']:
+            attributes = test_run.get('attributes',{})
+            attributes.update(self.context.test_data.get_metadata())
+            test_run['attributes'] = attributes
+        json_bundle = json.dumps(main_bundle)
+        srv.put(json_bundle, 'lava-dispatcher.bundle', stream)
 
     def combine_bundles(self):
         if not self.all_bundles:
-            return
+            return {
+                     "test_runs": [],
+                     "format": "Dashboard Bundle Format 1.2"
+                   }
         main_bundle = self.all_bundles.pop(0)
         test_runs = main_bundle['test_runs']
         for bundle in self.all_bundles:
             test_runs += bundle['test_runs']
-        return json.dumps(main_bundle)
+        return main_bundle
 
 
 class ResultUploader(Thread):
@@ -104,3 +120,4 @@
             if not data:
                 break
             self.data = self.data + data
+        self.s.close()
 
=== modified file 'lava/dispatcher/config.py'
--- lava/dispatcher/config.py	2011-05-03 18:35:43 +0000
+++ lava/dispatcher/config.py	2011-05-20 22:53:40 +0000
@@ -60,7 +60,7 @@
 BOARDS = {
         "panda01": PandaBoard,
         "panda02": PandaBoard,
-        "beagle01": BeagleBoard,
+        "beaglexm01": BeagleBoard,
         "bbg01": Mx51evkBoard,
         "mx53loco01": Mx53locoBoard,
         }