Merge lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-update into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
Ryan Beisner
Status: | Merged |
---|---|
Merged at revision: | 139 |
Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-update |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
965 lines (+362/-232) 8 files modified
Makefile (+11/-12) tests/00-setup (+7/-3) tests/020-basic-trusty-liberty (+11/-0) tests/021-basic-wily-liberty (+9/-0) tests/README (+33/-0) tests/basic_deployment.py (+171/-164) tests/charmhelpers/contrib/amulet/utils.py (+101/-53) tests/tests.yaml (+19/-0) |
To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Pending | ||
OpenStack Charmers | Pending | ||
James Page | Pending | ||
Corey Bryant | Pending | ||
Review via email: mp+269302@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2015-07-01.
Description of the change
Update amulet tests for T-K, V-K, prep for T-L and W-L. Resolve bug 1474030 race in svc restart checks.
This merge proposal is dependent on the corresponding charm-helpers changes landing:
https:/
To post a comment you must log in.
charm_lint_check #5719 neutron-api-next for 1chb1n mp263594
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/5719/