Merge lp:~jtv/maas-test/maasfixture-log-earlier into lp:maas-test

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: 144
Merged at revision: 144
Proposed branch: lp:~jtv/maas-test/maasfixture-log-earlier
Merge into: lp:maas-test
Diff against target: 30 lines (+9/-4)
1 file modified
maastest/maasfixture.py (+9/-4)
To merge this branch: bzr merge lp:~jtv/maas-test/maasfixture-log-earlier
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Raphaël Badin (community) Approve
Review via email: mp+214718@code.launchpad.net

Commit message

Request gathering of MAAS-side logs from an earlier stage in MAASFixture setup. The CI lab is hitting errors while making its first API request during MAASFixture setup, and this should add useful debugging information to that failure.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py 2014-04-03 02:10:29 +0000
+++ maastest/maasfixture.py 2014-04-08 10:58:53 +0000
@@ -281,6 +281,15 @@
281 # MAAS setup.281 # MAAS setup.
282 if self.proxy_url: # None or '' indicates no proxy.282 if self.proxy_url: # None or '' indicates no proxy.
283 self.configure_http_proxy(self.proxy_url)283 self.configure_http_proxy(self.proxy_url)
284
285 # We should have a working MAAS at this point, so if things break from
286 # here on, try to provide relevant information for debugging.
287 self.log_connection_details()
288 self.addCleanup(self.collect_logs)
289 self.addCleanup(self.dump_data)
290
291 # Now do the rest of the setup: import images, configure the
292 # controllers, and so on.
284 self.import_maas_images(293 self.import_maas_images(
285 series=self.series, architecture=self.architecture,294 series=self.series, architecture=self.architecture,
286 simplestreams_filter=self.simplestreams_filter)295 simplestreams_filter=self.simplestreams_filter)
@@ -288,10 +297,6 @@
288 if self.kvm_fixture.direct_ip is not None:297 if self.kvm_fixture.direct_ip is not None:
289 self.check_cluster_connected()298 self.check_cluster_connected()
290 self.configure_cluster()299 self.configure_cluster()
291 # Cleanups registration.
292 self.addCleanup(self.collect_logs)
293 self.addCleanup(self.dump_data)
294 self.log_connection_details()
295300
296 def log_connection_details(self):301 def log_connection_details(self):
297 """Log the details on how to connect to this MAAS server."""302 """Log the details on how to connect to this MAAS server."""

Subscribers

People subscribed via source and target branches