Juju Charms Collection
nova-compute package

Merge lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. 1496746
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 158
Proposed branch: lp://staging/~gnuoy/charms/trusty/nova-compute/1496746
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 1265 lines (+810/-65)
17 files modified
hooks/charmhelpers/contrib/network/ufw.py (+5/-6)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
hooks/charmhelpers/contrib/openstack/context.py (+52/-7)
hooks/charmhelpers/contrib/openstack/templating.py (+28/-1)
hooks/charmhelpers/contrib/openstack/utils.py (+177/-1)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+2/-11)
hooks/charmhelpers/core/host.py (+32/-16)
hooks/charmhelpers/core/hugepage.py (+8/-1)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/charmhelpers/core/strutils.py (+30/-0)
hooks/nova_compute_utils.py (+1/-0)
metadata.yaml (+1/-1)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+9/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10)
unit_tests/test_nova_compute_utils.py (+2/-0)
To merge this branch: bzr merge lp://staging/~gnuoy/charms/trusty/nova-compute/1496746
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Review via email: mp+271451@code.staging.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 #10188 nova-compute-next for gnuoy mp271451
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12437437/
Build: http://10.245.162.77:8080/job/charm_lint_check/10188/

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

charm_unit_test #9346 nova-compute-next for gnuoy mp271451
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/12437441/
Build: http://10.245.162.77:8080/job/charm_unit_test/9346/

lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 updated
160. By Liam Young

Fix lint and unit tests

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

charm_amulet_test #6476 nova-compute-next for gnuoy mp271451
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12437538/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6476/

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

charm_lint_check #10190 nova-compute-next for gnuoy mp271451
    LINT OK: passed

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

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

charm_unit_test #9348 nova-compute-next for gnuoy mp271451
    UNIT OK: passed

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

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

charm_amulet_test #6478 nova-compute-next for gnuoy mp271451
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12437724/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6478/

lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 updated
161. By Liam Young

EMpty commit to kick osci

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

charm_lint_check #10246 nova-compute-next for gnuoy mp271451
    LINT OK: passed

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

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

charm_unit_test #9401 nova-compute-next for gnuoy mp271451
    UNIT OK: passed

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

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

charm_amulet_test #6487 nova-compute-next for gnuoy mp271451
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12447113/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6487/

Revision history for this message
Chris Glass (tribaal) wrote :

+1 despite failures since they are unrelated to this change/

I'll take the blame should it prove wrong.

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