Merge lp:~doanac/utah/bug1160148 into lp:utah/trunk

Proposed by Andy Doan
Status: Merged
Approved by: Max Brustkern
Approved revision: 269
Merged at revision: 269
Proposed branch: lp:~doanac/utah/bug1160148
Merge into: lp:utah/trunk
Diff against target: 18 lines (+5/-2)
1 file modified
utah/provisioning/baremetal/cobbler.py (+5/-2)
To merge this branch: bzr merge lp:~doanac/utah/bug1160148
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+155396@code.launchpad.net

Description of the change

This disables the wait_for_booted which is causing a regression in autopilot jobs.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

+1. Let's get this merged so we can avoid holding up any other jobs.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/provisioning/baremetal/cobbler.py'
2--- utah/provisioning/baremetal/cobbler.py 2013-03-21 14:50:49 +0000
3+++ utah/provisioning/baremetal/cobbler.py 2013-03-26 03:55:32 +0000
4@@ -196,9 +196,12 @@
5 self.rsyslog.wait_for_install(config.install_steps,
6 self._disable_netboot)
7
8+ # TODO: wait_for_booted isn't working on d-i installs and
9+ # autopilot jobs like:
10+ # http://10.97.0.1:8080/view/autopilot/job/ps-unity-autopilot-release-testing/140/label=autopilot-nvidia/
11+ # self.rsyslog.wait_for_booted(config.boot_steps)
12+
13 if self.installtype == 'desktop':
14- # TODO: look into getting this working for d-i installs
15- self.rsyslog.wait_for_booted(config.boot_steps)
16 self._removenfs()
17
18 retry(self.sshcheck, logmethod=self.logger.info,

Subscribers

People subscribed via source and target branches

to all changes: