Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/amulet-git-fixups into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 126
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/neutron-api/amulet-git-fixups
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 100 lines (+48/-19)
3 files modified
hooks/neutron_api_utils.py (+1/-0)
tests/00-setup (+1/-0)
tests/basic_deployment.py (+46/-19)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/amulet-git-fixups
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+264572@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Amulet deploy from source updates:
  * Install amulet pre-req python-distro-info
  * Use modified icehouse branches due to requirements issues
  * Add neutron-*aas repos for kilo+

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

charm_lint_check #6116 neutron-api-next for corey.bryant mp264572
    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/11873598/
Build: http://10.245.162.77:8080/job/charm_lint_check/6116/

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

charm_unit_test #5748 neutron-api-next for corey.bryant mp264572
    UNIT OK: passed

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

137. By Corey Bryant

Fix lint error

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

charm_lint_check #6120 neutron-api-next for corey.bryant mp264572
    LINT OK: passed

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

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

charm_unit_test #5752 neutron-api-next for corey.bryant mp264572
    UNIT OK: passed

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

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

charm_amulet_test #5105 neutron-api-next for corey.bryant mp264572
    AMULET OK: passed

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

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

charm_amulet_test #5109 neutron-api-next for corey.bryant mp264572
    AMULET OK: passed

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

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