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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 133
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git-ods
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 481 lines (+153/-41)
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/nova_compute_utils.py (+35/-4)
tests/basic_deployment.py (+2/-2)
unit_tests/test_nova_compute_utils.py (+16/-7)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git-ods
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+257191@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 #3824 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3611 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #3610 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #3868 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3655 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_lint_check #3877 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3664 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_lint_check #3907 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3694 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

155. By Corey Bryant

Sync charm-helpers

156. By Corey Bryant

Add comment to fix bin symlinks

157. By Corey Bryant

Sync charm-helpers

158. By Corey Bryant

Sync charm-helpers

159. By Corey Bryant

Clone from github in deploy from source amulet tests

160. 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 #4467 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4192 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4090 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #4529 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4254 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4108 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #4537 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4262 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4116 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

161. By Corey Bryant

Sync charm-helpers

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

charm_lint_check #4841 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4521 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4332 nova-compute-next for corey.bryant mp257191
    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/11397779/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4332/

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