Juju Charms Collection
nova-cloud-controller package

Merge lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

  1. Trusty Tahr (14.04)
  2. lp1531102-trunk
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 172
Proposed branch: lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/lp1531102-trunk
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk
Diff against target: 670 lines (+292/-42)
9 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
hooks/charmhelpers/contrib/openstack/context.py (+25/-9)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+22/-17)
hooks/charmhelpers/core/host.py (+12/-1)
hooks/charmhelpers/core/hugepage.py (+2/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+67/-8)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/lp1531102-trunk
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+281867@code.qastaging.launchpad.net

Commit message

Resync helpers

Description of the change

Resync stable helpers to fixup issues with liberty point releases.

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

charm_lint_check #16735 nova-cloud-controller for james-page mp281867
    LINT OK: passed

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

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

charm_unit_test #15639 nova-cloud-controller for james-page mp281867
    UNIT OK: passed

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

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

charm_amulet_test #8558 nova-cloud-controller for james-page mp281867
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv07
ERROR:root:Make target returned non-zero.

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

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

charm_amulet_test #8709 nova-cloud-controller for james-page mp281867
    AMULET OK: passed

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

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

charm_amulet_test #8710 nova-cloud-controller for james-page mp281867
    AMULET OK: passed

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

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