Merge lp://qastaging/~james-page/charms/trusty/neutron-api/mitaka-b2 into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by James Page
Status: Merged
Merged at revision: 179
Proposed branch: lp://qastaging/~james-page/charms/trusty/neutron-api/mitaka-b2
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 38 lines (+4/-6)
2 files modified
templates/mitaka/neutron.conf (+2/-2)
tests/basic_deployment.py (+2/-4)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/mitaka-b2
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+287028@code.qastaging.launchpad.net
To post a comment you must log in.
179. By James Page

Switch test as well

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

charm_lint_check #1377 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1135 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #488 neutron-api-next for james-page mp287028
    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/15188364/
Build: http://10.245.162.36:8080/job/charm_amulet_test/488/

180. By James Page

Drop ec2 and objectstore tests - not pertinent to neutron-api and removed as of liberty

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

charm_lint_check #1466 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1221 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #521 neutron-api-next for james-page mp287028
    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/15196136/
Build: http://10.245.162.36:8080/job/charm_amulet_test/521/

181. By James Page

Fixup relation data key

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

charm_lint_check #1468 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1223 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #523 neutron-api-next for james-page mp287028
    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/15197068/
Build: http://10.245.162.36:8080/job/charm_amulet_test/523/

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