Juju Charms Collection
ceph-radosgw package

Merge lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602 into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

  1. Trusty Tahr (14.04)
  2. next-amulet-1602
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 63
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 2301 lines (+1027/-327)
21 files modified
hooks/charmhelpers/contrib/network/ip.py (+36/-19)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-4)
hooks/charmhelpers/contrib/openstack/context.py (+42/-10)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5)
hooks/charmhelpers/contrib/openstack/neutron.py (+18/-6)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+3/-2)
hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+11/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+218/-69)
hooks/charmhelpers/contrib/python/packages.py (+35/-11)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+391/-25)
hooks/charmhelpers/core/hookenv.py (+41/-7)
hooks/charmhelpers/core/host.py (+97/-41)
hooks/charmhelpers/core/services/helpers.py (+11/-5)
hooks/charmhelpers/core/templating.py (+13/-7)
hooks/charmhelpers/fetch/__init__.py (+9/-1)
hooks/charmhelpers/fetch/archiveurl.py (+1/-1)
hooks/charmhelpers/fetch/bzrurl.py (+22/-32)
hooks/charmhelpers/fetch/giturl.py (+20/-23)
tests/basic_deployment.py (+33/-55)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-4)
unit_tests/test_ceph_radosgw_context.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+286415@code.qastaging.launchpad.net

Commit message

Update amulet test definitions; Wait for workload status before testing; Cherry-pick hopem amulet test update; Sync charm helpers for Mitaka awareness.

Description of the change

Update amulet test definitions

Wait for workload status before testing

Cherry-pick hopem amulet test update

Sync charm helpers for Mitaka awareness

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

charm_lint_check #754 ceph-radosgw-next for 1chb1n mp286415
    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/15103294/
Build: http://10.245.162.36:8080/job/charm_lint_check/754/

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

charm_unit_test #660 ceph-radosgw-next for 1chb1n mp286415
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/660/

lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602 updated
66. By Ryan Beisner

Sync charm helpers for Mitaka awareness

67. By Ryan Beisner

Tidy lint

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

charm_lint_check #755 ceph-radosgw-next for 1chb1n mp286415
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/755/

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

charm_unit_test #661 ceph-radosgw-next for 1chb1n mp286415
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/15103417/
Build: http://10.245.162.36:8080/job/charm_unit_test/661/

lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602 updated
68. By Ryan Beisner

Update amulet test

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

charm_amulet_test #309 ceph-radosgw-next for 1chb1n mp286415
    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/15103502/
Build: http://10.245.162.36:8080/job/charm_amulet_test/309/

lp://qastaging/~1chb1n/charms/trusty/ceph-radosgw/next-amulet-1602 updated
69. By Ryan Beisner

Fix unit test re: c-h sync

70. By Ryan Beisner

Disable Xenial test re: swift api fail

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

charm_lint_check #757 ceph-radosgw-next for 1chb1n mp286415
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/757/

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

charm_unit_test #663 ceph-radosgw-next for 1chb1n mp286415
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/663/

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

charm_amulet_test #311 ceph-radosgw-next for 1chb1n mp286415
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/311/

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