Merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/amulet-refactor-1509 into lp://qastaging/charms/trusty/rabbitmq-server
Proposed by
Ryan Beisner
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/amulet-refactor-1509 |
| Merge into: | lp://qastaging/charms/trusty/rabbitmq-server |
| Diff against target: |
5325 lines (+3668/-928) (has conflicts) 54 files modified
Makefile (+5/-4) charm-helpers-tests.yaml (+5/-0) hooks/charmhelpers/cli/__init__.py (+191/-0) hooks/charmhelpers/cli/benchmark.py (+36/-0) hooks/charmhelpers/cli/commands.py (+32/-0) hooks/charmhelpers/cli/hookenv.py (+23/-0) hooks/charmhelpers/cli/host.py (+31/-0) hooks/charmhelpers/cli/unitdata.py (+39/-0) hooks/charmhelpers/contrib/network/ip.py (+5/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+7/-1) hooks/charmhelpers/contrib/openstack/context.py (+22/-5) hooks/charmhelpers/contrib/openstack/neutron.py (+40/-3) hooks/charmhelpers/contrib/openstack/utils.py (+51/-14) hooks/charmhelpers/contrib/peerstorage/__init__.py (+21/-5) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/files.py (+45/-0) hooks/charmhelpers/core/hookenv.py (+48/-4) hooks/charmhelpers/core/host.py (+150/-41) hooks/charmhelpers/core/hugepage.py (+62/-0) hooks/charmhelpers/core/services/helpers.py (+26/-2) hooks/charmhelpers/fetch/__init__.py (+8/-0) hooks/rabbit_utils.py (+3/-13) hooks/rabbitmq_server_relations.py (+73/-15) metadata.yaml (+4/-1) scripts/collect_rabbitmq_stats.sh (+4/-1) tests/00-setup (+16/-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/019-basic-vivid-kilo (+9/-0) tests/020-basic-trusty-liberty (+11/-0) tests/021-basic-wily-liberty (+9/-0) tests/README (+63/-0) tests/basic_deployment.py (+492/-0) tests/charmhelpers/__init__.py (+0/-38) tests/charmhelpers/contrib/__init__.py (+0/-15) tests/charmhelpers/contrib/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/deployment.py (+93/-0) tests/charmhelpers/contrib/amulet/utils.py (+771/-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 (+965/-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/fstab.py (+0/-134) tests/charmhelpers/core/services/__init__.py (+0/-18) tests/charmhelpers/core/strutils.py (+0/-42) tests/charmhelpers/core/sysctl.py (+0/-56) tests/charmhelpers/core/templating.py (+0/-68) tests/tests.yaml (+20/-0) Path conflict: <deleted> / hooks/cluster-relation-broken Text conflict in charm-helpers-tests.yaml Conflict adding file hooks/charmhelpers/cli. Moved existing file to hooks/charmhelpers/cli.moved. Text conflict in hooks/charmhelpers/contrib/openstack/amulet/deployment.py Text conflict in hooks/charmhelpers/contrib/openstack/neutron.py Text conflict in hooks/charmhelpers/contrib/peerstorage/__init__.py Conflict adding file hooks/charmhelpers/core/files.py. Moved existing file to hooks/charmhelpers/core/files.py.moved. Text conflict in hooks/charmhelpers/core/hookenv.py Text conflict in hooks/charmhelpers/core/host.py Text conflict in hooks/charmhelpers/core/services/helpers.py Conflict adding file hooks/leader-deposed. Moved existing file to hooks/leader-deposed.moved. Conflict adding file hooks/leader-elected. Moved existing file to hooks/leader-elected.moved. Conflict adding file hooks/leader-settings-changed. Moved existing file to hooks/leader-settings-changed.moved. Text conflict in hooks/rabbitmq_server_relations.py Conflict: can't delete tests/charmhelpers.moved because it is not empty. Not deleting. Conflict adding file tests/charmhelpers. Moved existing file to tests/charmhelpers.moved. Conflict because tests/charmhelpers.moved is not versioned, but has versioned children. Versioned directory. Conflict: can't delete tests/charmhelpers.moved/core because it is not empty. Not deleting. Conflict because tests/charmhelpers.moved/core is not versioned, but has versioned children. Versioned directory. Contents conflict in tests/charmhelpers.moved/core/hookenv.py Contents conflict in tests/charmhelpers.moved/core/host.py Conflict: can't delete tests/charmhelpers.moved/core/services because it is not empty. Not deleting. Conflict because tests/charmhelpers.moved/core/services is not versioned, but has versioned children. Versioned directory. Contents conflict in tests/charmhelpers.moved/core/services/base.py Contents conflict in tests/charmhelpers.moved/core/services/helpers.py Contents conflict in tests/charmhelpers.moved/core/unitdata.py |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/amulet-refactor-1509 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-09-01.
Description of the change
Refactor amulet tests, deprecate old tests, update Makefile and metadata yamls.
Sync tests/charmhelpers for new rmq test helpers
Cluster race bug:
https:/
This charm merge proposal is dependent on charm-helpers mp @:
https:/
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Unmerged revisions
- 110. By Ryan Beisner
-
rebase
- 109. By Ryan Beisner
-
sync tests/charmhelpers for new rmq test helpers
- 108. By Ryan Beisner
-
refactor amulet tests, deprecate old tests, update Makefile and metadata yamls
- 107. By Billy Olsen
-
[niedbalski,
r=billy- olsen] Fix rabbit clustering when dns resolution is
not available. - 106. By Billy Olsen
-
[1chb1n,
r=billy- olsen] Update the collect_ rabbitmq_ stats script to check for
the updated location of the pid file in >= vivid.Closes-Bug: #1485722
- 105. By Liam Young
-
[gnuoy,trivial] Charmhelper sync (+1'd by mojo)
- 104. By Edward Hope-Morley
-
[billy-
olsen,r= hopem] Adds cli to charmhelpers sync to fix amulet
test import issue. - 103. By Liam Young
-
[gnuoy,trivial] Pre-release charmhelper sync to pickup leadership election peer migration fix
- 102. By Liam Young
-
Add cli module properly
- 101. By Liam Young
-
[gnuoy,trivial] Pre-release charmhelper sync to pickup cli module
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #9149 rabbitmq-server for 1chb1n mp269691
LINT OK: passed
Build: http://