Juju Charms Collection
glance package

Merge lp://qastaging/~gnuoy/charms/trusty/glance/1453940 into lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next

  1. Trusty Tahr (14.04)
  2. 1453940
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 138
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/glance/1453940
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 1305 lines (+886/-104) (has conflicts)
8 files modified
charmhelpers/contrib/openstack/context.py (+8/-9)
charmhelpers/contrib/storage/linux/ceph.py (+224/-2)
hooks/glance_relations.py (+13/-19)
templates/ceph.conf (+2/-1)
tests/charmhelpers/contrib/amulet/utils.py (+234/-52)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
unit_tests/test_glance_relations.py (+26/-16)
Text conflict in unit_tests/test_glance_relations.py
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/glance/1453940
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+268605@code.qastaging.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 #8424 glance-next for gnuoy mp268605
    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/12136056/
Build: http://10.245.162.77:8080/job/charm_lint_check/8424/

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

charm_unit_test #7818 glance-next for gnuoy mp268605
    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/12136058/
Build: http://10.245.162.77:8080/job/charm_unit_test/7818/

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

charm_amulet_test #5931 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_lint_check #8481 glance-next for gnuoy mp268605
    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/12140600/
Build: http://10.245.162.77:8080/job/charm_lint_check/8481/

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

charm_unit_test #7872 glance-next for gnuoy mp268605
    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/12140603/
Build: http://10.245.162.77:8080/job/charm_unit_test/7872/

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

charm_lint_check #8484 glance-next for gnuoy mp268605
    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/12141053/
Build: http://10.245.162.77:8080/job/charm_lint_check/8484/

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

charm_unit_test #7875 glance-next for gnuoy mp268605
    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/12141054/
Build: http://10.245.162.77:8080/job/charm_unit_test/7875/

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

charm_amulet_test #5940 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_amulet_test #5943 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_lint_check #8547 glance-next for gnuoy mp268605
    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/12149010/
Build: http://10.245.162.77:8080/job/charm_lint_check/8547/

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

charm_unit_test #7935 glance-next for gnuoy mp268605
    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/12149013/
Build: http://10.245.162.77:8080/job/charm_unit_test/7935/

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

charm_lint_check #8548 glance-next for gnuoy mp268605
    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/12149141/
Build: http://10.245.162.77:8080/job/charm_lint_check/8548/

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

charm_unit_test #7936 glance-next for gnuoy mp268605
    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/12149142/
Build: http://10.245.162.77:8080/job/charm_unit_test/7936/

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

charm_lint_check #8549 glance-next for gnuoy mp268605
    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/12149391/
Build: http://10.245.162.77:8080/job/charm_lint_check/8549/

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

charm_unit_test #7937 glance-next for gnuoy mp268605
    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/12149392/
Build: http://10.245.162.77:8080/job/charm_unit_test/7937/

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

charm_amulet_test #5962 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_amulet_test #5963 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_amulet_test #5964 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_lint_check #8648 glance-next for gnuoy mp268605
    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/12182292/
Build: http://10.245.162.77:8080/job/charm_lint_check/8648/

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

charm_unit_test #7985 glance-next for gnuoy mp268605
    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/12182293/
Build: http://10.245.162.77:8080/job/charm_unit_test/7985/

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

charm_amulet_test #6013 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_lint_check #8704 glance-next for gnuoy mp268605
    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/12193056/
Build: http://10.245.162.77:8080/job/charm_lint_check/8704/

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

charm_unit_test #8038 glance-next for gnuoy mp268605
    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/12193057/
Build: http://10.245.162.77:8080/job/charm_unit_test/8038/

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

charm_amulet_test #6026 glance-next for gnuoy mp268605
    AMULET OK: passed

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

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

charm_lint_check #9383 glance-next for gnuoy mp268605
    LINT OK: passed

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

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

charm_unit_test #8679 glance-next for gnuoy mp268605
    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/12273018/
Build: http://10.245.162.77:8080/job/charm_unit_test/8679/

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

charm_amulet_test #6248 glance-next for gnuoy mp268605
    AMULET OK: passed

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

lp://qastaging/~gnuoy/charms/trusty/glance/1453940 updated
152. By Liam Young

Charm helper sync

153. By Liam Young

Fix unit tests

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

charm_lint_check #9537 glance-next for gnuoy mp268605
    LINT OK: passed

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

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

charm_unit_test #8779 glance-next for gnuoy mp268605
    UNIT OK: passed

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

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

charm_amulet_test #6309 glance-next for gnuoy mp268605
    AMULET OK: passed

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

lp://qastaging/~gnuoy/charms/trusty/glance/1453940 updated
154. By Liam Young

Charm helper sync

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

charm_lint_check #9700 glance-next for gnuoy mp268605
    LINT OK: passed

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

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

charm_unit_test #8933 glance-next for gnuoy mp268605
    UNIT OK: passed

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

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

charm_amulet_test #6347 glance-next for gnuoy mp268605
    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/12329523/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6347/

Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM +1 (think amulet fail is unrelated)

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