Juju Charms Collection
rabbitmq-server package

Merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

  1. Trusty Tahr (14.04)
  2. next-amulet-15.10
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 122
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 2551 lines (+1504/-156)
24 files modified
Makefile (+1/-0)
hooks/charmhelpers/contrib/network/ip.py (+5/-3)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+63/-9)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
hooks/charmhelpers/contrib/openstack/context.py (+100/-29)
hooks/charmhelpers/contrib/openstack/neutron.py (+17/-3)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/charmhelpers/contrib/openstack/templating.py (+30/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+233/-2)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+226/-13)
hooks/charmhelpers/core/hookenv.py (+32/-0)
hooks/charmhelpers/core/host.py (+44/-17)
hooks/charmhelpers/core/hugepage.py (+10/-1)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/charmhelpers/core/strutils.py (+30/-0)
hooks/rabbit_utils.py (+1/-1)
hooks/rabbitmq_server_relations.py (+4/-1)
scripts/collect_rabbitmq_stats.sh (+1/-0)
tests/README (+12/-0)
tests/basic_deployment.py (+68/-43)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+56/-16)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+109/-11)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+275115@code.qastaging.launchpad.net

Description of the change

Update amulet tests: Add Liberty coverage; Add services and relations to satisfy workload status; Fix test races using extended status wait; Sync charmhelpers.

Includes jamespage's fixes re: bug 1508295

Also resolves Wily rmq+nrpe functional issue: bug 1508537

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

charm_unit_test #11361 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

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

charm_lint_check #12248 rabbitmq-server-next for 1chb1n mp275115
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12883498/
Build: http://10.245.162.77:8080/job/charm_lint_check/12248/

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
125. By Ryan Beisner

fix lint

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

charm_lint_check #12249 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

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

charm_unit_test #11363 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
126. By Ryan Beisner

add tests readme

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

charm_lint_check #12251 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

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

charm_unit_test #11365 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

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

charm_amulet_test #7463 rabbitmq-server-next for 1chb1n mp275115
    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/12883694/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7463/

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

charm_amulet_test #7465 rabbitmq-server-next for 1chb1n mp275115
    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/12884162/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7465/

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

charm_amulet_test #7462 rabbitmq-server-next for 1chb1n mp275115
    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/12884187/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7462/

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
127. By Ryan Beisner

Move 00-setup to prevent unnecessary boostrap/destroy loop in amulet test runs

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

charm_unit_test #11366 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

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

charm_lint_check #12283 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
128. By Ryan Beisner

merge lp:~james-page/charms/trusty/rabbitmq-server/status-reeval re: bug 1508295

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

charm_lint_check #12284 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

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

charm_unit_test #11394 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
129. By Ryan Beisner

re-merge lp:~james-page/charms/trusty/rabbitmq-server/status-reeval re: bug 1508295

130. By Ryan Beisner

enable wily-liberty amulet test

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

charm_lint_check #12286 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

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

charm_unit_test #11395 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-amulet-15.10 updated
131. By Ryan Beisner

fix wily rmq+nrpe lockfile issue bug 1508537

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

charm_lint_check #12288 rabbitmq-server-next for 1chb1n mp275115
    LINT OK: passed

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

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

charm_unit_test #11397 rabbitmq-server-next for 1chb1n mp275115
    UNIT OK: passed

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

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

charm_amulet_test #7475 rabbitmq-server-next for 1chb1n mp275115
    AMULET OK: passed

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

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