Merge lp://qastaging/~james-page/charms/trusty/nova-compute/xenial into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by James Page
Status: Merged
Merged at revision: 194
Proposed branch: lp://qastaging/~james-page/charms/trusty/nova-compute/xenial
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 190 lines (+185/-0)
1 file modified
templates/mitaka/nova.conf (+185/-0)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/xenial
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+285780@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #239 nova-compute-next for james-page mp285780
    LINT OK: passed

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

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

charm_unit_test #224 nova-compute-next for james-page mp285780
    UNIT OK: passed

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

Revision history for this message
David Ames (thedac) wrote :

Other than the s/kilo/mitaka in the nova.conf template this looks good.

Do we expect the xenial amulet tests to pass as it is dependent on the NUM_CPUS cpu_count() change?

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

charm_amulet_test #116 nova-compute-next for james-page mp285780
    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/15020546/
Build: http://10.245.162.36:8080/job/charm_amulet_test/116/

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

charm_amulet_test #122 nova-compute-next for james-page mp285780
    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/15022817/
Build: http://10.245.162.36:8080/job/charm_amulet_test/122/

195. By James Page

Fixup template header

196. By James Page

Disable mitaka tests until all merges land

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

charm_lint_check #371 nova-compute-next for james-page mp285780
    LINT OK: passed

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

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

charm_unit_test #293 nova-compute-next for james-page mp285780
    UNIT OK: passed

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

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

charm_amulet_test #147 nova-compute-next for james-page mp285780
    AMULET OK: passed

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

Revision history for this message
David Ames (thedac) wrote :

LGTM, Merging

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