Juju Charms Collection
swift-storage package

Merge lp://staging/~james-page/charms/trusty/swift-storage/xenial into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

  1. Trusty Tahr (14.04)
  2. xenial
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 104
Proposed branch: lp://staging/~james-page/charms/trusty/swift-storage/xenial
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 663 lines (+177/-86)
12 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2)
charmhelpers/contrib/openstack/context.py (+11/-7)
charmhelpers/contrib/openstack/neutron.py (+18/-6)
charmhelpers/contrib/openstack/utils.py (+65/-23)
charmhelpers/contrib/python/packages.py (+22/-7)
charmhelpers/core/host.py (+41/-26)
charmhelpers/fetch/giturl.py (+3/-1)
lib/swift_storage_context.py (+0/-3)
lib/swift_storage_utils.py (+2/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2)
unit_tests/test_swift_storage_context.py (+0/-4)
unit_tests/test_swift_storage_utils.py (+9/-4)
To merge this branch: bzr merge lp://staging/~james-page/charms/trusty/swift-storage/xenial
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+284515@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-01-30.

Description of the change

Resync helpers, fixup xenial support.

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

charm_lint_check #18391 swift-storage-next for james-page mp284515
    LINT FAIL: lint-test failed

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

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

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

charm_unit_test #17133 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

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

charm_amulet_test #9100 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

lp://staging/~james-page/charms/trusty/swift-storage/xenial updated
104. By James Page

Tidy lint

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

charm_lint_check #119 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_lint_check #125 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_unit_test #118 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

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

charm_amulet_test #23 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

lp://staging/~james-page/charms/trusty/swift-storage/xenial updated
105. By James Page

Baseline

106. By James Page

Enable xenial mitaka tests

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

charm_lint_check #237 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_unit_test #223 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

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

Looks good. Waiting on amulet. With the possible exception of the xenial-mitaka amulet test which may fail due to dependencies.

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

charm_amulet_test #118 swift-storage-next for james-page mp284515
    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/15019707/
Build: http://10.245.162.36:8080/job/charm_amulet_test/118/

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

charm_amulet_test #124 swift-storage-next for james-page mp284515
    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/15022712/
Build: http://10.245.162.36:8080/job/charm_amulet_test/124/

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

charm_amulet_test #130 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

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