Merge lp:~vila/uci-engine/1328170-final-msg-option into lp:uci-engine

[Vincent Ladeuil]

Use a specific cloud-init final message for the testbed

/!\ This complements https://code.launchpad.net/~vila/uci-vms/1328170-final-msg-option/+merge/222834 which needs to land first.

This address a point raised during a previous review (https://code.launchpad.net/~vila/uci-engine/1302473-uci-vms/+merge/222373) about using a specific message for the testbed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:562
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/835/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/835/rebuild

review: Needs Fixing (continuous-integration)

[Evan (ev)]

Looks good. One comment before you mark it as approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:562
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1167/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1167/rebuild

review: Approve (continuous-integration)

=== modified file 'test_runner/setup.py'
--- test_runner/setup.py	2014-06-06 15:43:47 +0000
+++ test_runner/setup.py	2014-06-11 16:35:15 +0000
@@ -27,7 +27,7 @@
     'amqplib==1.0.0',
     'mock==1.0.1',
     'ucitests==0.1.3',
-    'ucivms==0.1.1',
+    'ucivms==0.1.2',
 ]
 
 extra = {
 
=== modified file 'test_runner/tstrun/testbed.py'
--- test_runner/tstrun/testbed.py	2014-06-09 16:08:07 +0000
+++ test_runner/tstrun/testbed.py	2014-06-11 16:35:15 +0000
@@ -140,6 +140,7 @@
                       os.path.abspath(os.path.join(HERE, '..', 'run_test.py')))
         # No need to reboot a nova instance
         self.conf.set('vm.poweroff', 'False')
+        self.conf.set('vm.final_message', 'testbed setup completed.')
 
     def build_nova_client(self):
         args = [self.conf.get('os.username'),
@@ -267,6 +268,7 @@
         # get_ip_timeout and probably the two can be merged) -- vila 2014-01-30
         cloud_init_timeout = 1200  # in seconds so 20 minutes
         timeout_limit = time.time() + cloud_init_timeout
+        final_message = self.conf.get('vm.final_message')
         while time.time() < timeout_limit:
             # A relatively cheap way to catch cloud-init completion is to watch
             # the console for the specific message we specified in user-data).
@@ -287,7 +289,7 @@
                          ' retrying)'.format(self.instance.id))
                 time.sleep(5)
                 continue
-            if 'uci-vms finished installing in ' in console:
+            if final_message in console:
                 # We're good to go
                 log.info(
                     'cloud-init completed for {}'.format(self.instance.id))