Merge lp://staging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-lp1440953 into lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 154
Proposed branch: lp://staging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-lp1440953
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 49 lines (+8/-4)
3 files modified
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+4/-0)
hooks/charmhelpers/core/strutils.py (+2/-2)
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-lp1440953
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+256103@code.staging.launchpad.net

Description of the change

bug 1440953 (librbd1 libvirt qemu-img issue)
 - sync charm helpers
 - flip to debug output in amulet tests
 - flip to next charms in amulet test

Amulet will fail for nova-cloud-controller until related proposal lands (https://code.launchpad.net/~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953/+merge/256104).

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

charm_lint_check #3320 nova-cloud-controller-next for 1chb1n mp256103
    LINT OK: passed

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

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

charm_unit_test #3108 nova-cloud-controller-next for 1chb1n mp256103
    UNIT OK: passed

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

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

charm_amulet_test #3141 nova-cloud-controller-next for 1chb1n mp256103
    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/10820372/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3141/

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

Landed

review: Approve

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