Juju Charms Collection
rabbitmq-server package

Merge lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/ch-sync-cli-fix into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

  1. Trusty Tahr (14.04)
  2. ch-sync-cli-fix
  3. Merge into next
Proposed by Billy Olsen
Status: Merged
Merged at revision: 104
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/ch-sync-cli-fix
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 424 lines (+366/-2)
8 files modified
charm-helpers-tests.yaml (+1/-0)
hooks/charmhelpers/core/hookenv.py (+16/-1)
tests/charmhelpers/cli/__init__.py (+195/-0)
tests/charmhelpers/cli/benchmark.py (+36/-0)
tests/charmhelpers/cli/commands.py (+32/-0)
tests/charmhelpers/cli/host.py (+31/-0)
tests/charmhelpers/cli/unitdata.py (+39/-0)
tests/charmhelpers/core/hookenv.py (+16/-1)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/ch-sync-cli-fix
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Ryan Beisner (community) Approve
Review via email: mp+266619@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 #7375 rabbitmq-server-next for billy-olsen mp266619
    LINT OK: passed

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

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

charm_unit_test #6843 rabbitmq-server-next for billy-olsen mp266619
    UNIT OK: passed

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

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

charm_amulet_test #5546 rabbitmq-server-next for billy-olsen mp266619
    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/11975719/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5546/

lp://qastaging/~billy-olsen/charms/trusty/rabbitmq-server/ch-sync-cli-fix updated
104. By Billy Olsen

Include cli in the rmq amulet

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

charm_lint_check #7376 rabbitmq-server-next for billy-olsen mp266619
    LINT OK: passed

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

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

charm_unit_test #6844 rabbitmq-server-next for billy-olsen mp266619
    UNIT OK: passed

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

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

charm_amulet_test #5548 rabbitmq-server-next for billy-olsen mp266619
    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/11976402/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5548/

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

I would suggest merging this, even though the amulet test fails. It was previously failing that functional test.

This merge proposal resolves an import error, introduced by a charm-helpers CLI.

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

PS FYI, this is the only os-charm which had an amulet test affected by the CLI helper addition.

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

Regarding the pre-existing test failure, we will still need to address that separately.

Revision history for this message
Edward Hope-Morley (hopem) wrote :

Lets get this landed. It does not touch any code outside of amulet tests (which are broken anyway).

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