Merge lp://qastaging/~hopem/charms/trusty/ceph/lp1523871 into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 140
Proposed branch: lp://qastaging/~hopem/charms/trusty/ceph/lp1523871
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 204 lines (+69/-14)
3 files modified
config.yaml (+6/-0)
hooks/ceph_hooks.py (+20/-9)
hooks/utils.py (+43/-5)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/ceph/lp1523871
Reviewer Review Type Date Requested Status
James Page Approve
OpenStack Charmers Pending
Review via email: mp+286487@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-02-03.

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

charm_unit_test #117 ceph-next for hopem mp284936
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/117/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #138 ceph-next for hopem mp284936
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/138/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #10 ceph-next for hopem mp284936
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/10/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #141 ceph-next for hopem mp284936
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/141/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #152 ceph-next for hopem mp284936
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/152/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #88 ceph-next for hopem mp284936
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/88/

Revision history for this message
James Page (james-page) wrote : Posted in a previous version of this proposal

Please refactor to remove the code dupe on what should be get_public_addr.

review: Needs Fixing
Revision history for this message
James Page (james-page) : Posted in a previous version of this proposal
Revision history for this message
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal

fixed review issues.

133. By Edward Hope-Morley

post-review fixes

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

charm_lint_check #827 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/827/

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

charm_unit_test #732 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/732/

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

charm_amulet_test #330 ceph-next for hopem mp286487
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/330/

134. By Edward Hope-Morley

restore sanity

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

charm_unit_test #752 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/752/

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

charm_lint_check #849 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/849/

135. By Edward Hope-Morley

more

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

charm_amulet_test #345 ceph-next for hopem mp286487
    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/15112614/
Build: http://10.245.162.36:8080/job/charm_amulet_test/345/

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

charm_unit_test #753 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/753/

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

charm_lint_check #850 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/850/

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

charm_amulet_test #347 ceph-next for hopem mp286487
    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/15114119/
Build: http://10.245.162.36:8080/job/charm_amulet_test/347/

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

charm_amulet_test #348 ceph-next for hopem mp286487
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/348/

136. By Edward Hope-Morley

fixup

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

charm_unit_test #1008 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1008/

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

charm_lint_check #1172 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1172/

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

charm_amulet_test #454 ceph-next for hopem mp286487
    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/15173246/
Build: http://10.245.162.36:8080/job/charm_amulet_test/454/

137. By Edward Hope-Morley

only use fallback for get_public_addr() if networks not provided in config

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

charm_lint_check #1379 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1379/

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

charm_unit_test #1138 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1138/

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

charm_amulet_test #491 ceph-next for hopem mp286487
    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/15191020/
Build: http://10.245.162.36:8080/job/charm_amulet_test/491/

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

#recheck

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

Tests on this MP are hitting an issue which is resolved in /next. A rebase should give known-good tests against the proposal.

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

charm_unit_test #1224 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1224/

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

charm_lint_check #1469 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1469/

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

charm_amulet_test #524 ceph-next for hopem mp286487
    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/15197489/
Build: http://10.245.162.36:8080/job/charm_amulet_test/524/

138. By Edward Hope-Morley

sync /next

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

charm_lint_check #1472 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1472/

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

charm_unit_test #1226 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1226/

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

charm_amulet_test #528 ceph-next for hopem mp286487
    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/15197976/
Build: http://10.245.162.36:8080/job/charm_amulet_test/528/

Revision history for this message
James Page (james-page) wrote :

#recheck

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

charm_unit_test #1231 ceph-next for hopem mp286487
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1231/

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

charm_lint_check #1477 ceph-next for hopem mp286487
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1477/

Revision history for this message
James Page (james-page) wrote :

This LGTM - please land once amulet tests have passed.

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

charm_amulet_test #532 ceph-next for hopem mp286487
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/532/

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