Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git-ods into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 117
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git-ods
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 414 lines (+150/-31)
6 files modified
hooks/charmhelpers/contrib/openstack/utils.py (+65/-18)
hooks/charmhelpers/contrib/python/packages.py (+28/-5)
hooks/charmhelpers/fetch/giturl.py (+7/-5)
hooks/neutron_api_utils.py (+35/-0)
templates/git/upstart/neutron-server.upstart (+1/-1)
unit_tests/test_neutron_api_utils.py (+14/-2)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git-ods
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+257189@code.qastaging.launchpad.net

Commit message

Adds support to:
* Use a Python virtualenv when deploying from source
* Default to shallow clone for git (depth=1)
* Pass http_proxy to pip installs if specified

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

charm_lint_check #3822 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #3609 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_amulet_test #3608 neutron-api-next for corey.bryant mp257189
    AMULET OK: passed

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

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

charm_lint_check #3866 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #3653 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_lint_check #3875 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #3662 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_amulet_test #3657 neutron-api-next for corey.bryant mp257189
    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/10872281/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3657/

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

charm_lint_check #3906 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #3693 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_lint_check #4259 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #3985 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

136. By Corey Bryant

Sync charm-helpers

137. By Corey Bryant

Add comment to fix bin symlinks

138. By Corey Bryant

Sync charm-helpers

139. By Corey Bryant

Sync charm-helpers

140. By Corey Bryant

Clone from github in deploy from source amulet tests

141. By Corey Bryant

Add libyaml-dev as base git package

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

charm_lint_check #4465 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #4190 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_amulet_test #4088 neutron-api-next for corey.bryant mp257189
    AMULET OK: passed

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

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

charm_lint_check #4527 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #4252 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_lint_check #4535 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #4260 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_amulet_test #4114 neutron-api-next for corey.bryant mp257189
    AMULET OK: passed

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

142. By Corey Bryant

Sync charm-helpers

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

charm_lint_check #4839 neutron-api-next for corey.bryant mp257189
    LINT OK: passed

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

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

charm_unit_test #4519 neutron-api-next for corey.bryant mp257189
    UNIT OK: passed

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

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

charm_amulet_test #4330 neutron-api-next for corey.bryant mp257189
    AMULET OK: passed

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

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