Merge lp://staging/~hopem/charms/trusty/openstack-dashboard/lp1518975 into lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 103
Proposed branch: lp://staging/~hopem/charms/trusty/openstack-dashboard/lp1518975
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 662 lines (+211/-96)
8 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2)
hooks/charmhelpers/contrib/openstack/context.py (+11/-7)
hooks/charmhelpers/contrib/openstack/neutron.py (+18/-6)
hooks/charmhelpers/contrib/openstack/utils.py (+108/-43)
hooks/charmhelpers/contrib/python/packages.py (+22/-7)
hooks/charmhelpers/core/host.py (+41/-26)
hooks/charmhelpers/fetch/giturl.py (+5/-3)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2)
To merge this branch: bzr merge lp://staging/~hopem/charms/trusty/openstack-dashboard/lp1518975
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+285739@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #199 openstack-dashboard-next for hopem mp285739
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/199/

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

charm_lint_check #223 openstack-dashboard-next for hopem mp285739
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/223/

104. By Edward Hope-Morley

charm-helpers sync

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

charm_amulet_test #99 openstack-dashboard-next for hopem mp285739
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/99/

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

charm_lint_check #232 openstack-dashboard-next for hopem mp285739
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/232/

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

charm_unit_test #218 openstack-dashboard-next for hopem mp285739
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/218/

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

charm_amulet_test #114 openstack-dashboard-next for hopem mp285739
    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/15019359/
Build: http://10.245.162.36:8080/job/charm_amulet_test/114/

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