Juju Charms Collection
ceilometer package

Merge lp://staging/~james-page/charms/trusty/ceilometer/status-fixes-actions into lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer/next

  1. Trusty Tahr (14.04)
  2. status-fixes-actions
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 103
Proposed branch: lp://staging/~james-page/charms/trusty/ceilometer/status-fixes-actions
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer/next
Diff against target: 178 lines (+44/-13)
7 files modified
Makefile (+1/-1)
actions/actions.py (+17/-4)
actions/openstack_upgrade.py (+0/-1)
hooks/ceilometer_hooks.py (+2/-3)
lib/ceilometer_utils.py (+23/-2)
tests/basic_deployment.py (+1/-1)
unit_tests/test_actions_openstack_upgrade.py (+0/-1)
To merge this branch: bzr merge lp://staging/~james-page/charms/trusty/ceilometer/status-fixes-actions
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+274699@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12020 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11171 ceilometer-next for james-page mp274699
    UNIT OK: passed

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

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

charm_amulet_test #7382 ceilometer-next for james-page mp274699
    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/12798238/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7382/

lp://staging/~james-page/charms/trusty/ceilometer/status-fixes-actions updated
104. By James Page

Tidy py files in root to lib folder, sort out import of hooks in actions

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

charm_lint_check #12021 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11172 ceilometer-next for james-page mp274699
    UNIT OK: passed

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

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

charm_amulet_test #7383 ceilometer-next for james-page mp274699
    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/12798448/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7383/

lp://staging/~james-page/charms/trusty/ceilometer/status-fixes-actions updated
105. By James Page

update->flush

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

charm_lint_check #12022 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11173 ceilometer-next for james-page mp274699
    UNIT OK: passed

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

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

charm_amulet_test #7384 ceilometer-next for james-page mp274699
    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/12798676/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7384/

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

^ details from amulet test fail:
http://paste.ubuntu.com/12798703/

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

charm_lint_check #12023 ceilometer-next for james-page mp274699
    LINT OK: passed

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

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

charm_unit_test #11174 ceilometer-next for james-page mp274699
    UNIT OK: passed

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

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

charm_amulet_test #7385 ceilometer-next for james-page mp274699
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

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