Juju Charms Collection
ceilometer package

Merge lp://qastaging/~hopem/charms/trusty/ceilometer/pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/next

  1. Trusty Tahr (14.04)
  2. pki-token-support
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 72
Proposed branch: lp://qastaging/~hopem/charms/trusty/ceilometer/pki-token-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/next
Diff against target: 204 lines (+61/-14) (has conflicts)
6 files modified
hooks/ceilometer_contexts.py (+4/-4)
hooks/ceilometer_hooks.py (+29/-4)
hooks/ceilometer_utils.py (+4/-3)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
templates/icehouse/ceilometer.conf (+9/-3)
unit_tests/test_ceilometer_hooks.py (+1/-0)
Conflict adding file hooks/charmhelpers/contrib/openstack/templates/zeromq.  Moved existing file to hooks/charmhelpers/contrib/openstack/templates/zeromq.moved.
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/ceilometer/pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250373@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_lint_check #2138 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #1927 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2046 ceilometer-next for hopem mp250373
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10325806/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2046/

lp://qastaging/~hopem/charms/trusty/ceilometer/pki-token-support updated
76. By Edward Hope-Morley

synced /next

77. By Edward Hope-Morley

synced charm-helpers;

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

charm_lint_check #2211 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #2000 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2157 ceilometer-next for hopem mp250373
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10396518/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2157/

lp://qastaging/~hopem/charms/trusty/ceilometer/pki-token-support updated
78. By Edward Hope-Morley

ensure endpoints updated in keystone changed

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

charm_lint_check #2473 ceilometer-next for hopem mp250373
    LINT OK: passed

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

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

charm_unit_test #2263 ceilometer-next for hopem mp250373
    UNIT OK: passed

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

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

charm_amulet_test #2346 ceilometer-next for hopem mp250373
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10535888/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2346/

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

Approve

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