Merge lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-ch-sync-1601 into lp://staging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/next

Proposed by Ryan Beisner
Status: Needs review
Proposed branch: lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-ch-sync-1601
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/next
Diff against target: 969 lines (+642/-68)
4 files modified
tests/charmhelpers/contrib/amulet/deployment.py (+4/-3)
tests/charmhelpers/contrib/amulet/utils.py (+239/-9)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+38/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/openvswitch-odl/next-ch-sync-1601
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+283571@code.staging.launchpad.net

Description of the change

Sync charmhelpers for 16.01. *odl* charms were missed in recent pre-release ch-sync efforts.

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

charm_lint_check #17929 openvswitch-odl-next for 1chb1n mp283571
    LINT OK: passed

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

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

charm_unit_test #16756 openvswitch-odl-next for 1chb1n mp283571
    UNIT OK: passed

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

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

charm_amulet_test #8952 openvswitch-odl-next for 1chb1n mp283571
    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/14595638/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8952/

Unmerged revisions

11. By Ryan Beisner

sync charm helpers for 1601

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