Merge lp:~james-page/charms/trusty/swift-storage/lp1531102-trunk into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~james-page/charms/trusty/swift-storage/lp1531102-trunk | ||||
Merge into: | lp:~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:~james-page/charms/trusty/swift-storage/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young | 2016-01-07 | Needs Fixing on 2016-01-13 | |
Review via email:
|
Commit message
Resync helpers
Description of the change
Resync stable helpers to resolve liberty point release version detection problems.
charm_lint_check #16744 swift-storage for james-page mp281873
LINT OK: passed
Build: http://
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://
Build: http://
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://
Build: http://
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/
2016-01-07 22:50:31 INFO install from lib.swift_
2016-01-07 22:50:31 INFO install File "/var/lib/
2016-01-07 22:50:31 INFO install from charmhelpers.
2016-01-07 22:50:31 INFO install ImportError: cannot import name is_mapped_
2016-01-07 22:50:31 INFO juju.worker.
2016-01-07 22:50:31 ERROR juju.worker.
2016-01-07 22:50:31 DEBUG juju.worker.uniter modes.go:31 [AGENT-STATUS] failed: run install hook
Unmerged revisions
- 77. By James Page on 2016-01-07
-
Resync charm-helpers
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/ 10.245. 162.77: 8080/job/ charm_unit_ test/15629/
Build: http://