Juju Charms Collection
keystone package

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

  1. Trusty Tahr (14.04)
  2. git-ods
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 152
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 444 lines (+152/-40)
7 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/keystone_utils.py (+32/-3)
tests/basic_deployment.py (+2/-2)
unit_tests/test_keystone_hooks.py (+5/-4)
unit_tests/test_keystone_utils.py (+13/-3)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+257188@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 #3821 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3608 keystone-next for corey.bryant mp257188
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [unit_test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/10868274/
Build: http://10.245.162.77:8080/job/charm_unit_test/3608/

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

charm_amulet_test #3607 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #3830 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3617 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #3616 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #3865 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3652 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_lint_check #3874 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3661 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #3656 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #3905 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3692 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_lint_check #4258 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #3984 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods updated
181. By Corey Bryant

Sync charm-helpers

182. By Corey Bryant

Add comment to fix bin symlinks

183. By Corey Bryant

Sync charm-helpers

184. By Corey Bryant

Sync charm-helpers

185. By Corey Bryant

Clone from github in deploy from source amulet tests

186. 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 #4464 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #4189 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #4087 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #4526 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #4251 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #4105 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #4534 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #4259 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #4113 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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

charm_lint_check #4543 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #4268 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #4122 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods updated
187. By Corey Bryant

Sync charm-helpers

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

charm_lint_check #4838 keystone-next for corey.bryant mp257188
    LINT OK: passed

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

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

charm_unit_test #4518 keystone-next for corey.bryant mp257188
    UNIT OK: passed

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

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

charm_amulet_test #4329 keystone-next for corey.bryant mp257188
    AMULET OK: passed

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

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