Juju Charms Collection
ceilometer-agent package

Merge lp://staging/~1chb1n/charms/trusty/ceilometer-agent/next-amulet-add-initial into lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer-agent/next

  1. Trusty Tahr (14.04)
  2. next-amulet-add-initial
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 56
Proposed branch: lp://staging/~1chb1n/charms/trusty/ceilometer-agent/next-amulet-add-initial
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer-agent/next
Diff against target: 4014 lines (+2939/-192)
41 files modified
Makefile (+15/-4)
charm-helpers-tests.yaml (+5/-0)
hooks/ceilometer_hooks.py (+0/-4)
hooks/ceilometer_utils.py (+1/-1)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+47/-3)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3)
hooks/charmhelpers/contrib/openstack/context.py (+1/-1)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9)
hooks/charmhelpers/contrib/openstack/utils.py (+82/-22)
hooks/charmhelpers/contrib/python/packages.py (+30/-5)
hooks/charmhelpers/core/hookenv.py (+231/-38)
hooks/charmhelpers/core/host.py (+25/-7)
hooks/charmhelpers/core/services/base.py (+43/-19)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
hooks/charmhelpers/fetch/giturl.py (+7/-5)
metadata.yaml (+3/-2)
templates/ceilometer.conf.~1~ (+0/-21)
tests/00-setup (+15/-0)
tests/014-basic-precise-icehouse (+11/-0)
tests/015-basic-trusty-icehouse (+9/-0)
tests/016-basic-trusty-juno (+11/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-utopic-juno (+9/-0)
tests/019-basic-vivid-kilo (+9/-0)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/README (+62/-0)
tests/basic_deployment.py (+567/-0)
tests/charmhelpers/__init__.py (+38/-0)
tests/charmhelpers/contrib/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+93/-0)
tests/charmhelpers/contrib/amulet/utils.py (+533/-0)
tests/charmhelpers/contrib/openstack/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+183/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+604/-0)
tests/tests.yaml (+19/-0)
unit_tests/test_ceilometer_utils.py (+1/-1)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/ceilometer-agent/next-amulet-add-initial
Reviewer Review Type Date Requested Status
Corey Bryant Pending
Liam Young Pending
Review via email: mp+263040@code.staging.launchpad.net

Description of the change

Carry over amulet tests from ceilometer as a baseline; Add subordinate relation, service catalog, endpoint and nova ceilometer config checks.

Fix lint in unit test (unused import).

Resolve grizzly-override assumptions re: bug 1469241.

Remove accidental templates/ceilometer.conf.~1~ from rev23 circa 2013.

Update tags for consistency with other os-charms.

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

charm_lint_check #5620 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_unit_test #5252 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_amulet_test #4802 ceilometer-agent-next for 1chb1n mp263040
    AMULET OK: passed

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

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

charm_unit_test #5255 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_lint_check #5623 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_amulet_test #4806 ceilometer-agent-next for 1chb1n mp263040
    AMULET OK: passed

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

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

Flipped back to WIP re: tests/charmhelpers work in progress. Other things here are clear for review and input.

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

charm_lint_check #5677 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_unit_test #5309 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_lint_check #5679 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_unit_test #5311 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_amulet_test #4862 ceilometer-agent-next for 1chb1n mp263040
    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/11793911/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4862/

lp://staging/~1chb1n/charms/trusty/ceilometer-agent/next-amulet-add-initial updated
65. By Ryan Beisner

remove accidental templates/ceilometer.conf.~1~ from rev23 circa 2013

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

charm_lint_check #5705 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_unit_test #5337 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_amulet_test #4893 ceilometer-agent-next for 1chb1n mp263040
    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/11806134/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4893/

lp://staging/~1chb1n/charms/trusty/ceilometer-agent/next-amulet-add-initial updated
66. By Ryan Beisner

update test

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

charm_unit_test #5340 ceilometer-agent-next for 1chb1n mp263040
    UNIT OK: passed

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

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

charm_lint_check #5708 ceilometer-agent-next for 1chb1n mp263040
    LINT OK: passed

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

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

charm_amulet_test #4899 ceilometer-agent-next for 1chb1n mp263040
    AMULET OK: passed

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

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