Ubuntu CI Engine

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

  1. 1328170-final-msg-option
  2. Merge into trunk
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 562
Merged at revision: 710
Proposed branch: lp:~vila/uci-engine/1328170-final-msg-option
Merge into: lp:uci-engine
Diff against target: 41 lines (+4/-2)
2 files modified
test_runner/setup.py (+1/-1)
test_runner/tstrun/testbed.py (+3/-1)
To merge this branch: bzr merge lp:~vila/uci-engine/1328170-final-msg-option
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Evan (community) Approve
Review via email: mp+222839@code.launchpad.net

Commit message

Use a specific cloud-init final message for the testbed

Description of the change

/!\ 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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Evan (ev) wrote :

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

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test_runner/setup.py'
2--- test_runner/setup.py 2014-06-06 15:43:47 +0000
3+++ test_runner/setup.py 2014-06-11 16:35:15 +0000
4@@ -27,7 +27,7 @@
5 'amqplib==1.0.0',
6 'mock==1.0.1',
7 'ucitests==0.1.3',
8- 'ucivms==0.1.1',
9+ 'ucivms==0.1.2',
10 ]
11
12 extra = {
13
14=== modified file 'test_runner/tstrun/testbed.py'
15--- test_runner/tstrun/testbed.py 2014-06-09 16:08:07 +0000
16+++ test_runner/tstrun/testbed.py 2014-06-11 16:35:15 +0000
17@@ -140,6 +140,7 @@
18 os.path.abspath(os.path.join(HERE, '..', 'run_test.py')))
19 # No need to reboot a nova instance
20 self.conf.set('vm.poweroff', 'False')
21+ self.conf.set('vm.final_message', 'testbed setup completed.')
22
23 def build_nova_client(self):
24 args = [self.conf.get('os.username'),
25@@ -267,6 +268,7 @@
26 # get_ip_timeout and probably the two can be merged) -- vila 2014-01-30
27 cloud_init_timeout = 1200 # in seconds so 20 minutes
28 timeout_limit = time.time() + cloud_init_timeout
29+ final_message = self.conf.get('vm.final_message')
30 while time.time() < timeout_limit:
31 # A relatively cheap way to catch cloud-init completion is to watch
32 # the console for the specific message we specified in user-data).
33@@ -287,7 +289,7 @@
34 ' retrying)'.format(self.instance.id))
35 time.sleep(5)
36 continue
37- if 'uci-vms finished installing in ' in console:
38+ if final_message in console:
39 # We're good to go
40 log.info(
41 'cloud-init completed for {}'.format(self.instance.id))

Subscribers

People subscribed via source and target branches