Merge lp:~vila/ubuntu-ci-services-itself/1287955-flavors-config-option into lp:ubuntu-ci-services-itself
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | 316 |
Merged at revision: | 325 |
Proposed branch: | lp:~vila/ubuntu-ci-services-itself/1287955-flavors-config-option |
Merge into: | lp:ubuntu-ci-services-itself |
Diff against target: |
126 lines (+42/-16) 3 files modified
juju-deployer/configs/unit_config.yaml.tmpl (+3/-0) test_runner/tstrun/run_worker.py (+5/-5) test_runner/tstrun/testbed.py (+34/-11) |
To merge this branch: | bzr merge lp:~vila/ubuntu-ci-services-itself/1287955-flavors-config-option |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Chris Johnston (community) | Needs Fixing | ||
Review via email:
|
Commit message
Provide a config option to select the nova flavor for the testbed.
Description of the change
This adds a 'tr_flavors' config option in unit_config that describes the various flavors that the testbed should try to create a nova instance.
This defaults to 'm1.small' for canonistack and 'standard.small' for hpcloud.
While I removed a FIXME doing so, I filed 2 additional bugs:
- bug #1288622 local testing requires floating-ip on hpcloud
- bug #1288617 testbed nova instance flavor selection
To post a comment you must log in.
FAILED: Continuous integration, rev:315 /code.launchpad .net/~vila/ ubuntu- ci-services- itself/ 1287955- flavors- config- option/ +merge/ 209619/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/304/
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/304/ rebuild
http://