Merge lp://qastaging/~billy-olsen/charms/trusty/nova-compute/lp1512908-backport into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk

Proposed by Billy Olsen
Status: Merged
Merged at revision: 142
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/nova-compute/lp1512908-backport
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Diff against target: 132 lines (+46/-13)
2 files modified
hooks/nova_compute_context.py (+10/-1)
unit_tests/test_nova_compute_contexts.py (+36/-12)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/nova-compute/lp1512908-backport
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+277205@code.qastaging.launchpad.net

Description of the change

This is a backport of gnuoy's change for bug #1512908

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

charm_lint_check #13429 nova-compute for billy-olsen mp277205
    LINT OK: passed

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

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

charm_unit_test #12563 nova-compute for billy-olsen mp277205
    UNIT OK: passed

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

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

charm_amulet_test #7840 nova-compute for billy-olsen mp277205
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approved.

Ran amulet tests by hand:

juju-test INFO : Results: 10 passed, 1 failed, 0 errored

The failed one was trusty-kilo-git which seemed to be an undercloud issue which I don't think should block this.

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