Juju Charms Collection
cinder-backup package

Merge lp://qastaging/~hopem/charms/trusty/cinder-backup/amulet into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder-backup/next

Trusty Tahr (14.04)
amulet
Merge into next

Proposed by Edward Hope-Morley on 2016-01-15

Status:	Merged
Merged at revision:	2
Proposed branch:	lp://qastaging/~hopem/charms/trusty/cinder-backup/amulet
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder-backup/next
Diff against target:	5832 lines (+4396/-293) 43 files modified Makefile (+6/-1) charm-helpers-tests.yaml (+5/-0) hooks/charmhelpers/contrib/network/ip.py (+21/-19) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+108/-4) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) hooks/charmhelpers/contrib/openstack/context.py (+57/-11) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5) hooks/charmhelpers/contrib/openstack/neutron.py (+16/-2) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11) hooks/charmhelpers/contrib/openstack/utils.py (+121/-54) hooks/charmhelpers/contrib/python/packages.py (+13/-4) hooks/charmhelpers/contrib/storage/linux/ceph.py (+441/-59) hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0) hooks/charmhelpers/core/hookenv.py (+54/-6) hooks/charmhelpers/core/host.py (+126/-40) hooks/charmhelpers/core/hugepage.py (+2/-0) hooks/charmhelpers/core/services/helpers.py (+14/-5) hooks/charmhelpers/core/templating.py (+21/-8) hooks/charmhelpers/fetch/__init__.py (+10/-2) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+19/-24) hooks/cinder_backup_utils.py (+1/-1) metadata.yaml (+1/-1) tests/00-setup (+17/-0) tests/014-basic-precise-icehouse (+11/-0) tests/015-basic-trusty-icehouse (+9/-0) tests/016-basic-trusty-juno (+11/-0) tests/017-basic-trusty-kilo (+11/-0) tests/018-basic-vivid-kilo (+9/-0) tests/019-basic-wily-liberty (+9/-0) tests/README (+68/-0) tests/basic_deployment.py (+813/-0) tests/charmhelpers/__init__.py (+38/-0) tests/charmhelpers/contrib/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/deployment.py (+95/-0) tests/charmhelpers/contrib/amulet/utils.py (+818/-0) tests/charmhelpers/contrib/openstack/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+302/-0) tests/charmhelpers/contrib/openstack/amulet/utils.py (+985/-0) tests/tests.yaml (+20/-0)
To merge this branch:	bzr merge lp://qastaging/~hopem/charms/trusty/cinder-backup/amulet
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ryan Beisner (community)			Needs Fixing on 2016-01-15
OpenStack Charmers		2016-01-15	Pending
Review via email: mp+282734@code.qastaging.launchpad.net

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-15:

#

charm_lint_check #17398 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-15:

#

charm_unit_test #16254 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-15:

#

charm_amulet_test #8807 cinder-backup-next for hopem mp282734
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/14506624/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8807/

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2016-01-15:

#

@hopem - Thanks for your work on this.

It looks like openstack-origin needs to be added to this charm:

17:53:09 2016-01-15 17:53:09 Starting deployment of osci-sv05-jprop
17:53:42 2016-01-15 17:53:42 Invalid config charm /tmp/charm46pUnL/precise/cinder-backup openstack-origin=cloud:precise-icehouse
17:53:42 2016-01-15 17:53:42 Deployment stopped. run time: 32.80

review: Needs Fixing

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2016-01-17:

#

@1chb1n 10-4 thanks for taking a look. It turns out that I need to add this charm to the blacklist hardcoded in charmhelpers/contrib/openstack/amulet/deployment.py of charm that do not support the openstack-origin config option. I have pushed up a patch to get this in here:

lp:~hopem/charm-helpers/add-cinder-backup-amulet-support

Once that lands I will sync it in and rerun.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-17:

#

charm_unit_test #16363 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-17:

#

charm_lint_check #17515 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-18:

#

charm_amulet_test #8876 cinder-backup-next for hopem mp282734
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/14570536/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8876/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_lint_check #17863 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_unit_test #16694 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_amulet_test #8941 cinder-backup-next for hopem mp282734
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/14592327/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8941/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_unit_test #16701 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_lint_check #17870 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-21:

#

charm_amulet_test #8948 cinder-backup-next for hopem mp282734
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/14593637/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8948/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17926 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16753 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_amulet_test #8950 cinder-backup-next for hopem mp282734
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/14594399/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8950/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17935 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16760 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_amulet_test #8958 cinder-backup-next for hopem mp282734
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/14597061/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8958/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16761 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17936 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_amulet_test #8959 cinder-backup-next for hopem mp282734
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/14597299/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8959/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17939 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16765 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_amulet_test #8964 cinder-backup-next for hopem mp282734
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/14598144/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8964/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17949 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16772 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_amulet_test #8971 cinder-backup-next for hopem mp282734
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/14599669/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8971/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_lint_check #18016 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_unit_test #16835 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_amulet_test #8986 cinder-backup-next for hopem mp282734
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/14604016/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8986/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_unit_test #16837 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_lint_check #18018 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_amulet_test #8988 cinder-backup-next for hopem mp282734
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/14607761/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8988/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_unit_test #16838 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_lint_check #18019 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-23:

#

charm_amulet_test #8989 cinder-backup-next for hopem mp282734
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/14620188/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8989/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-24:

#

charm_lint_check #18073 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-24:

#

charm_unit_test #16889 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-24:

#

charm_amulet_test #8990 cinder-backup-next for hopem mp282734
AMULET FAIL: amulet-test failed

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

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

lp://qastaging/~hopem/charms/trusty/cinder-backup/amulet updated on 2016-01-24

2. By Edward Hope-Morley on 2016-01-24

[hopem,r=]

Sync charmhelpers and add amulet tests.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-24:

#

charm_lint_check #18074 cinder-backup-next for hopem mp282734
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-24:

#

charm_unit_test #16890 cinder-backup-next for hopem mp282734
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-25:

#

charm_amulet_test #9042 cinder-backup-next for hopem mp282734
AMULET OK: passed

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

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

to all changes:

Edward Hope-Morley

Nobuto Murata

OpenStack Charmers