Merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/amulet into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Liam Young
Status: Merged
Merged at revision: 79
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/neutron-api/amulet
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 1517 lines (+1303/-20)
23 files modified
Makefile (+12/-2)
charm-helpers-tests.yaml (+5/-0)
hooks/charmhelpers/contrib/python/packages.py (+2/-2)
hooks/charmhelpers/core/fstab.py (+2/-2)
hooks/charmhelpers/core/sysctl.py (+2/-2)
hooks/charmhelpers/core/unitdata.py (+1/-1)
hooks/charmhelpers/fetch/archiveurl.py (+10/-10)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
tests/00-setup (+11/-0)
tests/14-basic-precise-icehouse (+11/-0)
tests/15-basic-trusty-icehouse (+9/-0)
tests/16-basic-trusty-juno (+11/-0)
tests/README (+53/-0)
tests/basic_deployment.py (+382/-0)
tests/charmhelpers/__init__.py (+38/-0)
tests/charmhelpers/contrib/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+93/-0)
tests/charmhelpers/contrib/amulet/utils.py (+195/-0)
tests/charmhelpers/contrib/openstack/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+111/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+294/-0)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/amulet
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Ryan Beisner (community) Approve
Review via email: mp+249929@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 #2046 neutron-api-next for gnuoy mp249929
    LINT OK: passed

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

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

charm_unit_test #1836 neutron-api-next for gnuoy mp249929
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (failures=2)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/10270227/
Build: http://10.245.162.77:8080/job/charm_unit_test/1836/

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

charm_amulet_test #1984 neutron-api-next for gnuoy mp249929
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1984/

82. By Liam Young

Fix duplicate python-six

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

charm_lint_check #2048 neutron-api-next for gnuoy mp249929
    LINT OK: passed

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

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

charm_unit_test #1838 neutron-api-next for gnuoy mp249929
    UNIT OK: passed

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

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

charm_amulet_test #1986 neutron-api-next for gnuoy mp249929
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1986/

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

Looks good to me, thanks for the added coverage!

review: Approve
Revision history for this message
Corey Bryant (corey.bryant) wrote :

LGTM, just a couple of minor comment updates mentioned inline below that I'll fix up in the merge. Thanks Liam! Awesome coverage in this one.

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