diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 308: add a command that you can run before executing connection_command

Message ID 20120601015710.22822.94495.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson June 1, 2012, 1:57 a.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 308 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Fri 2012-06-01 13:55:17 +1200
message:
  add a command that you can run before executing connection_command
  (we will use it to reset the port of our slightly flaky cyclades)
modified:
  lava_dispatcher/client/master.py
  lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-05-29 01:58:57 +0000
+++ lava_dispatcher/client/master.py	2012-05-31 08:26:23 +0000
@@ -294,6 +294,9 @@ 
 
     def __init__(self, context, config):
         super(LavaMasterImageClient, self).__init__(context, config)
+        pre_connect = self.device_option("pre_connect_command")
+        if pre_connect:
+            logging_system(pre_connect)
         cmd = self.device_option("connection_command")
         proc = logging_spawn(cmd, timeout=1200)
         proc.logfile_read = self.sio

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-04-17 15:40:25 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-05-31 08:26:23 +0000
@@ -14,6 +14,8 @@ 
 
 connection_command = conmux-console %(hostname)s
 
+pre_connect_command =
+
 # The bootloader commands to boot the device into the test image (we
 # assume that the device boots into the master image without bootloader
 # intervention).