Juju Charms Collection
neutron-api package

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

  1. Trusty Tahr (14.04)
  2. next-amulet-15.10
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 153
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-15.10
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 448 lines (+177/-35)
11 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+40/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+40/-13)
hooks/charmhelpers/contrib/openstack/neutron.py (+17/-3)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/core/hookenv.py (+0/-1)
hooks/charmhelpers/core/host.py (+12/-1)
tests/basic_deployment.py (+19/-15)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+40/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-15.10
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+274709@code.qastaging.launchpad.net

Description of the change

Update amulet tests for Trusty-Liberty, Wily-Liberty.

Sync charmhelpers.

Add service and relations to satisfy workload status ready state.

Add new logic to wait for extended status message to confirm deploy is ready, before testing.

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

charm_lint_check #12024 neutron-api-next for 1chb1n mp274709
    LINT OK: passed

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

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

charm_unit_test #11175 neutron-api-next for 1chb1n mp274709
    UNIT OK: passed

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

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

charm_amulet_test #7386 neutron-api-next for 1chb1n mp274709
    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/12799468/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7386/

lp://qastaging/~1chb1n/charms/trusty/neutron-api/next-amulet-15.10 updated
157. By Ryan Beisner

fix relation check, remove varying unit data check

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

charm_lint_check #12028 neutron-api-next for 1chb1n mp274709
    LINT OK: passed

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

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

charm_unit_test #11177 neutron-api-next for 1chb1n mp274709
    UNIT OK: passed

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

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

charm_amulet_test #7391 neutron-api-next for 1chb1n mp274709
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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