Juju Charms Collection
odl-controller package

Merge lp://qastaging/~1chb1n/charms/trusty/odl-controller/next-amulet-mitaka-1601 into lp://qastaging/~openstack-charmers-archive/charms/trusty/odl-controller/next

  1. Trusty Tahr (14.04)
  2. next-amulet-mitaka-1601
  3. Merge into next
Proposed by Ryan Beisner
Status: Rejected
Rejected by: Ryan Beisner
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/odl-controller/next-amulet-mitaka-1601
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/odl-controller/next
Diff against target: 2070 lines (+889/-288)
20 files modified
hooks/charmhelpers/contrib/network/ip.py (+21/-19)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-3)
hooks/charmhelpers/contrib/openstack/context.py (+32/-2)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5)
hooks/charmhelpers/contrib/openstack/neutron.py (+8/-8)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11)
hooks/charmhelpers/contrib/openstack/utils.py (+100/-54)
hooks/charmhelpers/contrib/python/packages.py (+13/-4)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+441/-59)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0)
hooks/charmhelpers/core/hookenv.py (+41/-7)
hooks/charmhelpers/core/host.py (+103/-43)
hooks/charmhelpers/core/services/helpers.py (+11/-5)
hooks/charmhelpers/core/templating.py (+13/-7)
hooks/charmhelpers/fetch/__init__.py (+9/-1)
hooks/charmhelpers/fetch/archiveurl.py (+1/-1)
hooks/charmhelpers/fetch/bzrurl.py (+22/-32)
hooks/charmhelpers/fetch/giturl.py (+20/-23)
tests/basic_deployment.py (+1/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+8/-3)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/odl-controller/next-amulet-mitaka-1601
Reviewer Review Type Date Requested Status
James Page (community) Needs Fixing
Review via email: mp+283530@code.qastaging.launchpad.net

Description of the change

Enable mitaka amulet test; update test for neutron catalog names (lp1535410).

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

charm_lint_check #17861 odl-controller-next for 1chb1n mp283530
    LINT OK: passed

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

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

charm_unit_test #16692 odl-controller-next for 1chb1n mp283530
    UNIT OK: passed

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

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

charm_amulet_test #8939 odl-controller-next for 1chb1n mp283530
    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/14592346/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8939/

lp://qastaging/~1chb1n/charms/trusty/odl-controller/next-amulet-mitaka-1601 updated
19. By Ryan Beisner

sync charmhelpers for mitaka cloud archive recognition

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

charm_lint_check #17930 odl-controller-next for 1chb1n mp283530
    LINT OK: passed

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

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

charm_unit_test #16755 odl-controller-next for 1chb1n mp283530
    UNIT OK: passed

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

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

charm_amulet_test #8955 odl-controller-next for 1chb1n mp283530
    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/14595570/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8955/

Revision history for this message
James Page (james-page) wrote :

Ryan

there is a bug in charm-helpers that I fixed this morning that causes odl-controller to fail to install - a resync on this MP should resolve.

review: Needs Fixing
lp://qastaging/~1chb1n/charms/trusty/odl-controller/next-amulet-mitaka-1601 updated
20. By Ryan Beisner

resync charm helpers

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

charm_unit_test #16764 odl-controller-next for 1chb1n mp283530
    UNIT OK: passed

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

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

charm_lint_check #17940 odl-controller-next for 1chb1n mp283530
    LINT OK: passed

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

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

charm_amulet_test #8965 odl-controller-next for 1chb1n mp283530
    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/14598619/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8965/

Unmerged revisions

20. By Ryan Beisner

resync charm helpers

19. By Ryan Beisner

sync charmhelpers for mitaka cloud archive recognition

18. By Ryan Beisner

enable mitaka amulet test

17. By Ryan Beisner

update test for neutron catalog names (lp1535410)

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