UTAH

Merge lp:~nuclearbob/utah/timeout-updates into lp:utah

  1. timeout-updates
  2. Merge into dev
Proposed by Max Brustkern
Status: Merged
Approved by: Javier Collado
Approved revision: 919
Merged at revision: 921
Proposed branch: lp:~nuclearbob/utah/timeout-updates
Merge into: lp:utah
Diff against target: 58 lines (+7/-6)
2 files modified
debian/changelog (+1/-0)
utah/config.py (+6/-6)
To merge this branch: bzr merge lp:~nuclearbob/utah/timeout-updates
Reviewer Review Type Date Requested Status
Javier Collado (community) Approve
Andy Doan (community) Approve
Review via email: mp+165217@code.launchpad.net

Description of the change

This branch updates the default timeouts to match what we're using for hardware in the lab.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

seems smart.

review: Approve
Revision history for this message
Javier Collado (javier.collado) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-17 12:46:58 +0000
3+++ debian/changelog 2013-05-22 18:26:26 +0000
4@@ -17,6 +17,7 @@
5 * Updated packaging to set correct permissions on files within utah
6 directories
7 * Updated Makefile clean target (LP: #1178657)
8+ * Updated timeouts to match slowest ones in use for hardware in lab
9
10 -- Max Brustkern <max@canonical.com> Fri, 17 May 2013 10:17:05 -0400
11
12
13=== modified file 'utah/config.py'
14--- utah/config.py 2013-05-17 14:19:18 +0000
15+++ utah/config.py 2013-05-22 18:26:26 +0000
16@@ -57,9 +57,9 @@
17 # Default kernel parameters
18 boot=None,
19 # Time to wait for installed system to boot
20- boottimeout=90,
21+ boottimeout=600,
22 # Time to wait between checking if system is available over ssh
23- checktimeout=15,
24+ checktimeout=180,
25 # Default setting for whether to clean up after a test run
26 clean=True,
27 # Maximum amount of time to wait for the client package to install
28@@ -92,7 +92,7 @@
29 # Packages to install on system
30 installpackages=['openssh-server', 'gdebi'],
31 # Time limit for overall install process
32- installtimeout=3600,
33+ installtimeout=9000,
34 # Default install type (mini is default to save bandwidth and space)
35 installtype='mini',
36 # Directory to store local images
37@@ -218,18 +218,18 @@
38 {
39 'message': 'system booted',
40 'pattern': '.*Linux version \\d',
41- 'timeout': 180,
42+ 'timeout': 600,
43 },
44 {
45 'message': 'disk mounted',
46 'pattern': '.*mounted filesystem with ordered data',
47- 'timeout': 180,
48+ 'timeout': 600,
49 },
50 {
51 'message': 'UTAH uuid received',
52 'uuid': True, # binds this to the callback for wait_for_booted
53 'pattern': '.*Machine UUID:\s+(.*)',
54- 'timeout': 180,
55+ 'timeout': 600,
56 },
57 ],
58 )

Subscribers

People subscribed via source and target branches