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

Proposed by Liam Young
Status: Merged
Merged at revision: 148
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/nova-compute/subctxt-fix
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 93 lines (+32/-32)
2 files modified
hooks/charmhelpers/contrib/openstack/context.py (+30/-26)
hooks/nova_compute_utils.py (+2/-6)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/nova-compute/subctxt-fix
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+266262@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 #7181 nova-compute-next for gnuoy mp266262
    LINT OK: passed

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

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

charm_unit_test #6645 nova-compute-next for gnuoy mp266262
    UNIT OK: passed

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

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

charm_amulet_test #5467 nova-compute-next for gnuoy mp266262
    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/11961399/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5467/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI:
The test rig is on hold due to undercloud system issues. I don't anticipate having automated amulet results ahead of the 15.07 charm cut date.

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Environment running amulet test is unreliable ATM, thus the failure...

LGTM, Approved.

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