Merge lp://qastaging/~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953 into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 121
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 61 lines (+9/-4)
4 files modified
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+4/-0)
hooks/charmhelpers/core/strutils.py (+2/-2)
hooks/nova_compute_utils.py (+1/-0)
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+256104@code.qastaging.launchpad.net

Description of the change

- explicitly install librbd1 re: bug 1440953
 - flip amulet next charm on
 - flip amulet test debug on
 - sync charm helpers
 - delint

Also resolves amulet test failure on nova-cloud-controller.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3321 nova-compute-next for 1chb1n mp256104
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3321/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3109 nova-compute-next for 1chb1n mp256104
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3109/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3142 nova-compute-next for 1chb1n mp256104
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10820360/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3142/

Revision history for this message
James Page (james-page) wrote :

This looks fine - dealing with the amulet test failure (due to landed commit not being fully tested).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches