Merge lp://qastaging/~thedac/charms/trusty/neutron-api/action-managed-upgrade into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by David Ames
Status: Merged
Merged at revision: 146
Proposed branch: lp://qastaging/~thedac/charms/trusty/neutron-api/action-managed-upgrade
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 140 lines (+102/-1)
5 files modified
actions.yaml (+2/-0)
actions/openstack_upgrade.py (+34/-0)
config.yaml (+10/-0)
hooks/neutron_api_hooks.py (+1/-1)
unit_tests/test_actions_openstack_upgrade.py (+55/-0)
To merge this branch: bzr merge lp://qastaging/~thedac/charms/trusty/neutron-api/action-managed-upgrade
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+272437@code.qastaging.launchpad.net

Description of the change

Action managed upgrade

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

charm_lint_check #10773 neutron-api-next for thedac mp272437
    LINT OK: passed

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

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

charm_unit_test #9949 neutron-api-next for thedac mp272437
    UNIT OK: passed

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

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

charm_amulet_test #6777 neutron-api-next for thedac mp272437
    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/12556319/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6777/

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Looks good but amulet tests are failing. I suspect it's unrelated to this mp, maybe beisner has already seen this?

review: Approve
144. By David Ames

Pull in upstream

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

charm_lint_check #10969 neutron-api-next for thedac mp272437
    LINT OK: passed

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

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

charm_unit_test #10184 neutron-api-next for thedac mp272437
    UNIT OK: passed

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

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

charm_amulet_test #6861 neutron-api-next for thedac mp272437
    AMULET OK: passed

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

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