Merge lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk

Proposed by James Page
Status: Needs review
Proposed branch: lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Diff against target: 584 lines (+285/-36)
8 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
charmhelpers/contrib/openstack/utils.py (+21/-17)
charmhelpers/contrib/storage/linux/loopback.py (+0/-10)
charmhelpers/core/host.py (+12/-1)
charmhelpers/core/hugepage.py (+2/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk
Reviewer Review Type Date Requested Status
Liam Young (community) Needs Fixing
Review via email: mp+281873@code.qastaging.launchpad.net

Commit message

Resync helpers

Description of the change

Resync stable helpers to resolve liberty point release version detection problems.

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

charm_unit_test #15629 swift-storage for james-page mp281873
    UNIT FAIL: unit-test failed

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

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

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

charm_lint_check #16744 swift-storage for james-page mp281873
    LINT OK: passed

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

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

charm_amulet_test #8562 swift-storage for james-page mp281873
    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/14430895/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8562/

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

charm_amulet_test #8574 swift-storage for james-page mp281873
    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/14433304/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8574/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

@jamespage FYI, swift-storage/0 unit install hook fails with:

2016-01-07 22:50:30 INFO install Setting up python-six (1.1.0-2) ...
2016-01-07 22:50:31 INFO install Traceback (most recent call last):
2016-01-07 22:50:31 INFO install File "/var/lib/juju/agents/unit-swift-storage-0/charm/hooks/install.real", line 6, in <module>
2016-01-07 22:50:31 INFO install from lib.swift_storage_utils import (
2016-01-07 22:50:31 INFO install File "/var/lib/juju/agents/unit-swift-storage-0/charm/hooks/lib/swift_storage_utils.py", line 49, in <module>
2016-01-07 22:50:31 INFO install from charmhelpers.contrib.storage.linux.loopback import (
2016-01-07 22:50:31 INFO install ImportError: cannot import name is_mapped_loopback_device
2016-01-07 22:50:31 INFO juju.worker.uniter.context context.go:579 handling reboot
2016-01-07 22:50:31 ERROR juju.worker.uniter.operation runhook.go:107 hook "install" failed: exit status 1
2016-01-07 22:50:31 DEBUG juju.worker.uniter modes.go:31 [AGENT-STATUS] failed: run install hook

Revision history for this message
Liam Young (gnuoy) :
review: Needs Fixing

Unmerged revisions

77. By James Page

Resync charm-helpers

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