Merge lp://qastaging/~1chb1n/charms/trusty/mysql/fix-amulet-deps into lp://qastaging/charms/trusty/mysql

Proposed by Ryan Beisner
Status: Merged
Merge reported by: Matt Bruzek
Merged at revision: not available
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/mysql/fix-amulet-deps
Merge into: lp://qastaging/charms/trusty/mysql
Diff against target: 2049 lines (+1097/-195)
20 files modified
Makefile (+3/-3)
hooks/charmhelpers/contrib/database/mysql.py (+48/-21)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+124/-3)
hooks/charmhelpers/core/decorators.py (+16/-0)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hookenv.py (+371/-43)
hooks/charmhelpers/core/host.py (+150/-26)
hooks/charmhelpers/core/hugepage.py (+62/-0)
hooks/charmhelpers/core/services/base.py (+43/-19)
hooks/charmhelpers/core/services/helpers.py (+20/-4)
hooks/charmhelpers/core/strutils.py (+2/-2)
hooks/charmhelpers/core/templating.py (+0/-1)
hooks/charmhelpers/core/unitdata.py (+62/-18)
hooks/charmhelpers/fetch/__init__.py (+32/-15)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+8/-6)
tests/00-setup (+17/-9)
tests/021-basic-wily-liberty (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+84/-21)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/mysql/fix-amulet-deps
Reviewer Review Type Date Requested Status
Matt Bruzek (community) Approve
Review via email: mp+268410@code.qastaging.launchpad.net

Description of the change

Fix amulet and unit test dependency issues (bug 1398918). Add unit test coverage summary.

Sync tests/charmhelpers to pull in service check helper bug fixes (bug 1484112)

Sync hooks/charmhelpers/fetch for liberty cloud archive enablement.

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

charm_unit_test #7734 mysql for 1chb1n mp268410
    UNIT OK: passed

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

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

charm_lint_check #8337 mysql for 1chb1n mp268410
    LINT OK: passed

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

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

charm_amulet_test #5879 mysql for 1chb1n mp268410
    AMULET OK: passed

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

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

Fyi, unit test with coverage looks like: http://paste.ubuntu.com/12124048/

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

charm_lint_check #8343 mysql for 1chb1n mp268410
    LINT OK: passed

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

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

charm_unit_test #7740 mysql for 1chb1n mp268410
    UNIT OK: passed

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

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

charm_amulet_test #5887 mysql for 1chb1n mp268410
    AMULET OK: passed

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

154. By Ryan Beisner

sync all hooks/charmhelpers

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

charm_lint_check #8366 mysql for 1chb1n mp268410
    LINT OK: passed

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

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

charm_unit_test #7763 mysql for 1chb1n mp268410
    UNIT OK: passed

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

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

charm_amulet_test #5911 mysql for 1chb1n mp268410
    AMULET OK: passed

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

Revision history for this message
Matt Bruzek (mbruzek) wrote :

This code change passes the sections that failed on bundletester previously. It looks good and gets my +1

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

to all changes: