Juju Charms Collection
neutron-api package

Merge lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-net-types-update into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. next-amulet-net-types-update
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 113
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-net-types-update
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 529 lines (+209/-94)
6 files modified
hooks/charmhelpers/core/hookenv.py (+64/-4)
hooks/charmhelpers/core/host.py (+1/-1)
hooks/charmhelpers/core/services/base.py (+2/-2)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
metadata.yaml (+1/-1)
tests/basic_deployment.py (+140/-85)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-net-types-update
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+258947@code.qastaging.launchpad.net

Commit message

amulet tests - update tests to reflect overlay net type changes; switch git tests to use github; sync charmhelpers.

vivid-kilo test not yet enabled due to bug 1454754.

Description of the change

amulet tests - update tests to reflect overlay net type changes; switch git tests to use github; sync charmhelpers.

vivid-kilo test not yet enabled due to bug 1454754.

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

charm_lint_check #4520 neutron-api-next for 1chb1n mp258947
    LINT OK: passed

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

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

charm_unit_test #4245 neutron-api-next for 1chb1n mp258947
    UNIT OK: passed

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

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

charm_amulet_test #4099 neutron-api-next for 1chb1n mp258947
    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/11114641/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4099/

lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-net-types-update updated
117. By Ryan Beisner

disable v-k test re: bug 1454754

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

charm_lint_check #4522 neutron-api-next for 1chb1n mp258947
    LINT OK: passed

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

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

charm_unit_test #4247 neutron-api-next for 1chb1n mp258947
    UNIT OK: passed

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

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

charm_amulet_test #4101 neutron-api-next for 1chb1n mp258947
    AMULET OK: passed

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

Revision history for this message
James Page (james-page) :
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