Juju Charms Collection
rabbitmq-server package

Merge lp://staging/~tribaal/charms/trusty/rabbitmq-server/backport-lp1500204-with-next-tests into lp://staging/charms/trusty/rabbitmq-server

  1. Trusty Tahr (14.04)
  2. backport-lp1500204-with-next-tests
  3. Merge into trunk
Proposed by Chris Glass
Status: Rejected
Rejected by: Chris Glass
Proposed branch: lp://staging/~tribaal/charms/trusty/rabbitmq-server/backport-lp1500204-with-next-tests
Merge into: lp://staging/charms/trusty/rabbitmq-server
Diff against target: 8993 lines (+3836/-4750)
64 files modified
hooks/rabbit_utils.py (+72/-50)
hooks/rabbitmq_server_relations.py (+19/-12)
metadata.yaml (+1/-1)
tests/00-setup (+17/-0)
tests/00_setup.sh (+0/-21)
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/019-basic-vivid-kilo (+9/-0)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/10-outofthebox-testing (+0/-30)
tests/10_basic_deploy_test.py (+0/-92)
tests/20-different-repositories (+0/-94)
tests/20_deploy_relations_test.py (+0/-251)
tests/30-switch-ssl (+0/-117)
tests/30_configuration_test.py (+0/-118)
tests/40_test_mirroring_queues.py (+0/-85)
tests/50_test_monitoring.py (+0/-71)
tests/amqp_tester.py (+0/-65)
tests/basic_deployment.py (+492/-0)
tests/charmhelpers/cli/__init__.py (+0/-191)
tests/charmhelpers/cli/benchmark.py (+0/-36)
tests/charmhelpers/cli/commands.py (+0/-32)
tests/charmhelpers/cli/hookenv.py (+0/-23)
tests/charmhelpers/cli/host.py (+0/-31)
tests/charmhelpers/cli/unitdata.py (+0/-39)
tests/charmhelpers/contrib/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+93/-0)
tests/charmhelpers/contrib/amulet/utils.py (+778/-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 (+198/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+963/-0)
tests/charmhelpers/contrib/ssl/__init__.py (+0/-94)
tests/charmhelpers/contrib/ssl/service.py (+0/-279)
tests/charmhelpers/core/__init__.py (+0/-15)
tests/charmhelpers/core/decorators.py (+0/-57)
tests/charmhelpers/core/files.py (+0/-45)
tests/charmhelpers/core/fstab.py (+0/-134)
tests/charmhelpers/core/hookenv.py (+0/-896)
tests/charmhelpers/core/host.py (+0/-494)
tests/charmhelpers/core/services/__init__.py (+0/-18)
tests/charmhelpers/core/services/base.py (+0/-353)
tests/charmhelpers/core/services/helpers.py (+0/-267)
tests/charmhelpers/core/strutils.py (+0/-42)
tests/charmhelpers/core/sysctl.py (+0/-56)
tests/charmhelpers/core/templating.py (+0/-68)
tests/charmhelpers/core/unitdata.py (+0/-521)
tests/deploy_common.py (+0/-52)
tests/deprecated/00_setup.sh (+21/-0)
tests/deprecated/10-outofthebox-testing (+30/-0)
tests/deprecated/10_basic_deploy_test.py (+92/-0)
tests/deprecated/20-different-repositories (+94/-0)
tests/deprecated/20_deploy_relations_test.py (+251/-0)
tests/deprecated/30-switch-ssl (+117/-0)
tests/deprecated/30_configuration_test.py (+118/-0)
tests/deprecated/40_test_mirroring_queues.py (+85/-0)
tests/deprecated/50_test_monitoring.py (+71/-0)
tests/deprecated/amqp_tester.py (+65/-0)
tests/deprecated/deploy_common.py (+52/-0)
tests/tests.yaml (+20/-0)
unit_tests/test_rabbit_utils.py (+71/-0)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/rabbitmq-server/backport-lp1500204-with-next-tests
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+274291@code.staging.launchpad.net

Description of the change

This branch is a backport to -stable of the patch/diff fixing LP:1500204 here: https://code.launchpad.net/~thedac/charms/trusty/rabbitmq-server/le-ignore-min-cluster/+merge/273474

This basically makes the charm ignore the min-cluster-size option in case juju leader-election is available. If it is, the nodes are told to cluster with the leader.

This brnahc also backports the -next tests since they were fixed to actually work with OSCI.

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

charm_unit_test #10962 rabbitmq-server for tribaal mp274291
    UNIT OK: passed

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

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

charm_lint_check #11785 rabbitmq-server for tribaal mp274291
    LINT OK: passed

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

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

charm_amulet_test #7302 rabbitmq-server for tribaal mp274291
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2015-10-13 17:59:48,192 get_unit_hostnames DEBUG: Unit host names: {'rabbitmq-server/2': 'juju-osci-sv17-machine-4', 'rabbitmq-server/0': 'juju-osci-sv17-machine-2', 'rabbitmq-server/1': 'juju-osci-sv17-machine-3'}
ERROR:root:Make target returned non-zero.

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

lp://staging/~tribaal/charms/trusty/rabbitmq-server/backport-lp1500204-with-next-tests updated
113. By Chris Glass

Ripping out test 415 since this feature is not in -stable.

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

charm_lint_check #11788 rabbitmq-server for tribaal mp274291
    LINT OK: passed

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

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

charm_unit_test #10965 rabbitmq-server for tribaal mp274291
    UNIT OK: passed

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

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

charm_amulet_test #7312 rabbitmq-server for tribaal mp274291
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
MESSAGE 9@172.17.102.2 [B174F62C-1377-439D-918E-63DA20F1D285-1444797831.92]
ERROR:root:Make target returned non-zero.

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

Unmerged revisions

113. By Chris Glass

Ripping out test 415 since this feature is not in -stable.

112. By Chris Glass

Stable=True

111. By Chris Glass

Ripped out and grafted the -next tests to the stable branch.

"Cursed, cursed creator! Why did I live?"

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