diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 274: Merge 0.5.12 hot-fix release

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

Commit Message

Zygmunt Krynicki April 2, 2012, 11:43 a.m. UTC
Merge authors:
  Dave Pigott (dpigott)
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~dpigott/lava-dispatcher/increase-timeout/+merge/98630
  proposed by: Dave Pigott (dpigott)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 274 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Mon 2012-04-02 13:40:28 +0200
message:
  Merge 0.5.12 hot-fix release
modified:
  doc/changes.rst
  lava_dispatcher/client/master.py


--
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 'doc/changes.rst'
--- doc/changes.rst	2012-04-02 11:38:38 +0000
+++ doc/changes.rst	2012-04-02 11:40:28 +0000
@@ -7,6 +7,15 @@ 
 ========================
 
 * Ready for development
+* Merge 0.5.12 bugfix release
+
+.. _version_0_5_12:
+
+Version 0.5.12
+==============
+
+* Increase timeout for rootfs deployment to 5 hours (18000 seconds).
+  This should help in working with vexpress.
 
 .. _version_0_5_11:
 

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-03-31 09:42:26 +0000
+++ lava_dispatcher/client/master.py	2012-04-02 11:36:56 +0000
@@ -81,7 +81,10 @@ 
     session.run('udevadm trigger')
     session.run('mkdir -p /mnt/root')
     session.run('mount /dev/disk/by-label/testrootfs /mnt/root')
-    _deploy_tarball_to_board(session, rootfs, '/mnt/root', timeout=3600)
+    # The timeout has to be this long for vexpress. For a full desktop it
+    # takes 214 minutes, plus about 25 minutes for the mkfs ext3, add
+    # another hour to err on the side of caution.
+    _deploy_tarball_to_board(session, rootfs, '/mnt/root', timeout=18000)
 
     session.run('echo linaro > /mnt/root/etc/hostname')
     #DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true