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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 141
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/cinder/git-1531612
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 324 lines (+129/-34)
7 files modified
charm-helpers-hooks.yaml (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+12/-2)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+3/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+6/-9)
hooks/charmhelpers/core/host.py (+34/-17)
hooks/charmhelpers/fetch/giturl.py (+0/-3)
hooks/charmhelpers/payload/archive.py (+73/-0)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/cinder/git-1531612
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+281955@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_unit_test #15693 cinder-next for corey.bryant mp281955
    UNIT OK: passed

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

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

charm_lint_check #16811 cinder-next for corey.bryant mp281955
    LINT OK: passed

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

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

charm_amulet_test #8576 cinder-next for corey.bryant mp281955
    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/14435305/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8576/

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

charm_lint_check #16839 cinder-next for corey.bryant mp281955
    LINT OK: passed

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

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

charm_unit_test #15725 cinder-next for corey.bryant mp281955
    UNIT OK: passed

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

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

charm_amulet_test #8608 cinder-next for corey.bryant mp281955
    AMULET OK: passed

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

143. By Corey Bryant

[corey.bryant,r=osci] Add hooks/charmhelpers/payload/archive.py

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

charm_unit_test #15954 cinder-next for corey.bryant mp281955
    UNIT OK: passed

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

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

charm_lint_check #17086 cinder-next for corey.bryant mp281955
    LINT OK: passed

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

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

charm_amulet_test #8689 cinder-next for corey.bryant mp281955
    AMULET OK: passed

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

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