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

Proposed by James Page
Status: Merged
Merged at revision: 142
Proposed branch: lp://qastaging/~james-page/charms/trusty/neutron-api/wily
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 40 lines (+21/-1)
2 files modified
hooks/install (+20/-0)
hooks/neutron_api_hooks.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/wily
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Needs Information
Liam Young (community) Approve
Review via email: mp+271917@code.qastaging.launchpad.net

Description of the change

python2 detection and install wrapper for wily onwards, where py2 is not installed by default.

This is really a placeholder to switch between py2 and py3 dynamically, but we need to test and update the codebase first before we can make that type of switch.

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

charm_lint_check #10429 neutron-api-next for james-page mp271917
    LINT OK: passed

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

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

charm_unit_test #9620 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

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

charm_amulet_test #6572 neutron-api-next for james-page mp271917
    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/12519969/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6572/

144. By James Page

Split out install hook instead

145. By James Page

Fixup install hook execution

146. By James Page

Exec install.real

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

charm_lint_check #10432 neutron-api-next for james-page mp271917
    LINT OK: passed

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

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

charm_unit_test #9624 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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

charm_unit_test #9627 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

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

On that ^ n-api amulet test fail, precise-icehouse timed out (45 minutes), stuck @: neutron-openvswitch/0 maintenance executing (config-changed) installing charm software;

I'm not sure if that was an infra hiccup or indicative of a real issue.

I re-triggered the test, and that run is also stuck at the same place:

00:12:56.675 2015-09-22 13:19:34 Adding relation neutron-api:neutron-plugin-api <-> neutron-openvswitch:neutron-plugin-api

http://paste.ubuntu.com/12521217/

Further testing and confirmation is recommended before landing.

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

charm_amulet_test #6575 neutron-api-next for james-page mp271917
    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/12521240/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6575/

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

charm_amulet_test #6581 neutron-api-next for james-page mp271917
    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/12521600/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6581/

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