Merge lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940 into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Liam Young
Status: Merged
Merged at revision: 157
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 1252 lines (+866/-91)
7 files modified
hooks/charmhelpers/contrib/openstack/context.py (+8/-9)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2)
hooks/nova_compute_hooks.py (+14/-23)
tests/charmhelpers/contrib/amulet/utils.py (+234/-52)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
unit_tests/test_nova_compute_hooks.py (+7/-0)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+269377@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9592 nova-compute-next for gnuoy mp269377
    LINT OK: passed

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

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

charm_unit_test #8830 nova-compute-next for gnuoy mp269377
    UNIT OK: passed

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

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

charm_amulet_test #6315 nova-compute-next for gnuoy mp269377
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6315/

159. By Liam Young

Charm helper sync

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

charm_lint_check #9709 nova-compute-next for gnuoy mp269377
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12328248/
Build: http://10.245.162.77:8080/job/charm_lint_check/9709/

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

charm_unit_test #8941 nova-compute-next for gnuoy mp269377
    UNIT OK: passed

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

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

charm_amulet_test #6337 nova-compute-next for gnuoy mp269377
    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/12328826/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6337/

Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM +1 (think amulet fail is unrelated)

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