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

Proposed by Liam Young
Status: Needs review
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/neutron-api/delete-quantum-ep
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 121 lines (+38/-23)
3 files modified
hooks/neutron_api_hooks.py (+11/-6)
tests/basic_deployment.py (+7/-7)
unit_tests/test_neutron_api_hooks.py (+20/-10)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/delete-quantum-ep
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Ryan Beisner (community) Needs Fixing
Review via email: mp+282287@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 #17240 neutron-api-next for gnuoy mp282287
    LINT OK: passed

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

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

charm_unit_test #16106 neutron-api-next for gnuoy mp282287
    UNIT OK: passed

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

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

charm_amulet_test #8744 neutron-api-next for gnuoy mp282287
    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/14486325/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8744/

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

@gnuoy - It looks like the amulet test will need to have its expectations updated in line with these proposed changes.

00:20:51.490 unexpected relation data in neutron-api identity-service - key 'quantum_service' does not exist
00:20:51.490
00:20:51.491 juju-test.conductor.014-basic-precise-icehouse DEBUG : Got exit code: 1
00:20:51.492 juju-test.conductor.014-basic-precise-icehouse RESULT : FAIL

review: Needs Fixing
166. By Liam Young

Fix amulet tests

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

charm_lint_check #17325 neutron-api-next for gnuoy mp282287
    LINT OK: passed

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

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

charm_unit_test #16185 neutron-api-next for gnuoy mp282287
    UNIT OK: passed

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

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

charm_amulet_test #8782 neutron-api-next for gnuoy mp282287
    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/14498273/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8782/

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

charm_amulet_test #8792 neutron-api-next for gnuoy mp282287
    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/14501591/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8792/

167. By Liam Young

Empty osci-kick commit

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

charm_lint_check #17391 neutron-api-next for gnuoy mp282287
    LINT OK: passed

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

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

charm_unit_test #16248 neutron-api-next for gnuoy mp282287
    UNIT OK: passed

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

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

charm_amulet_test #8796 neutron-api-next for gnuoy mp282287
    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/14504636/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8796/

Revision history for this message
David Ames (thedac) wrote :

Both Liam and I ran manual tests.

Looks good. Merging.

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

charm_amulet_test #8801 neutron-api-next for gnuoy mp282287
    AMULET OK: passed

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

Unmerged revisions

167. By Liam Young

Empty osci-kick commit

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