Merge lp://qastaging/~tealeg/charms/trusty/percona-cluster/pause-and-resume into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next

charm_unit_test #7599 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #8197 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

re: amulet tests...

Thank you for your work on this. These will be great test additions.

FYI - The percona-cluster charm's amulet tests aren't consistent with the other os-charms, as you may have noticed. I've got its amulet test refactor on my list for this cycle, to make it consistent with other os-charms in how they exercise each of the currently-supported ubuntu:openstack release combos. Be aware that, as written, the existing and proposed amulet tests will only exercise Trusty-Icehouse in automation. When I refactor the others, I'll be sure to preserve your amulet tests and pull those into the run-on-every-combo pivot.

Questions, suggestions re: this proposal:

Can you re-use existing amulet helpers instead of adding new local helpers? I know a few things just landed there with regard to actions and service checking in amulet tests.

For local helpers which are not yet represented in amulet helpers, yet potentially useful in other charm tests...

If there are OpenStack-specific, amulet-specific helpers which are useful in other charm tests, please land those in charmhelpers/contrib/openstack/amulet/utils.py.

If there are non-OpenStack-specific, amulet-specific helpers which are useful in other charm tests, please land those in charmhelpers/contrib/amulet/utils.py.

Feel free to holler with any questions. Thanks again!

charm_amulet_test #5843 percona-cluster-next for tealeg mp268238
    AMULET OK: passed

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

Hi Ryan,

Thanks for your feedback. Sorry we had some much variation and duplication in our submissions, it wasn't the plan.

Hopefully you should find the latest revision of this MP more in line with Adam and Alberto's work.

--
Geoff

> re: amulet tests...
>
> Thank you for your work on this. These will be great test additions.
>
> FYI - The percona-cluster charm's amulet tests aren't consistent with the
> other os-charms, as you may have noticed. I've got its amulet test refactor
> on my list for this cycle, to make it consistent with other os-charms in how
> they exercise each of the currently-supported ubuntu:openstack release combos.
> Be aware that, as written, the existing and proposed amulet tests will only
> exercise Trusty-Icehouse in automation. When I refactor the others, I'll be
> sure to preserve your amulet tests and pull those into the run-on-every-combo
> pivot.
>
> Questions, suggestions re: this proposal:
>
> Can you re-use existing amulet helpers instead of adding new local helpers? I
> know a few things just landed there with regard to actions and service
> checking in amulet tests.
>
> For local helpers which are not yet represented in amulet helpers, yet
> potentially useful in other charm tests...
>
> If there are OpenStack-specific, amulet-specific helpers which are useful in
> other charm tests, please land those in
> charmhelpers/contrib/openstack/amulet/utils.py.
>
> If there are non-OpenStack-specific, amulet-specific helpers which are useful
> in other charm tests, please land those in
> charmhelpers/contrib/amulet/utils.py.
>
> Feel free to holler with any questions. Thanks again!

charm_unit_test #7817 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #8423 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_amulet_test #5930 percona-cluster-next for tealeg mp268238
    AMULET FAIL: amulet-test failed

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

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

Looks like the 00-setup needs to be updated. We ran into that dep issue elsewhere.

This should be the ticket:
http://paste.ubuntu.com/12136867/

Otherwise, pending passing tests, looks good to me. Thank you for your work on this!

Cheers Ryan, will do!

charm_lint_check #8477 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_unit_test #7868 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_unit_test #7869 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #8478 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_amulet_test #5936 percona-cluster-next for tealeg mp268238
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
ERROR subprocess encountered error code 1
ERROR:root:Make target returned non-zero.

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

charm_amulet_test #5938 percona-cluster-next for tealeg mp268238
    AMULET FAIL: amulet-test failed

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

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

I believe if you rebase and resolve any resulting conflicts, the amulet tests in your branch will probably pass. We landed some necessary updates for other efforts, also fixed some amulet test dependency issues along the way.

> I believe if you rebase and resolve any resulting conflicts, the amulet tests
> in your branch will probably pass. We landed some necessary updates for other
> efforts, also fixed some amulet test dependency issues along the way.

Hi Ryan, it should be good to go now.

charm_lint_check #9091 percona-cluster-next for tealeg mp268238
    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/12237361/
Build: http://10.245.162.77:8080/job/charm_lint_check/9091/

charm_unit_test #8400 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9092 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_unit_test #8401 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_amulet_test #6147 percona-cluster-next for tealeg mp268238
    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/12238554/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6147/

It looks like the tests/00-setup here needs updated. We're working on updating them all, but if you can do that here, that should resolve the import error on the amulet test.

Example in-flight:
http://bazaar.launchpad.net/~1chb1n/charms/trusty/openstack-dashboard/next-amulet-fixup-1507/view/head:/tests/00-setup

> It looks like the tests/00-setup here needs updated. We're working on
> updating them all, but if you can do that here, that should resolve the import
> error on the amulet test.
>
> Example in-flight:
> http://bazaar.launchpad.net/~1chb1n/charms/trusty/openstack-dashboard/next-
> amulet-fixup-1507/view/head:/tests/00-setup

Hi Ryan,

It should already have exactly that content as I've merged in the most recent percona-cluster/next which has that. I'll poke around a little and see if I can find out the issue.

OK, I managed to reproduce the error by removing the python3-distro-info package from my VM. It seems that we need to explicitly pull in both python-distro-info and python3-distro-info. Let's see if that gets the Amulet tests to pass here too.

charm_unit_test #8463 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9157 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_amulet_test #6169 percona-cluster-next for tealeg mp268238
    AMULET OK: passed

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

N/F for the missing asserts about status, otherwise looks good.

charm_unit_test #8529 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9228 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_amulet_test #6190 percona-cluster-next for tealeg mp268238
    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/12252191/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6190/

charm_lint_check #9239 percona-cluster-next for tealeg mp268238
    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/12254011/
Build: http://10.245.162.77:8080/job/charm_lint_check/9239/

charm_unit_test #8540 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9242 percona-cluster-next for tealeg mp268238
    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/12254270/
Build: http://10.245.162.77:8080/job/charm_lint_check/9242/

charm_unit_test #8543 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_amulet_test #6201 percona-cluster-next for tealeg mp268238
    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/12255036/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6201/

charm_lint_check #9321 percona-cluster-next for tealeg mp268238
    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/12262221/
Build: http://10.245.162.77:8080/job/charm_lint_check/9321/

charm_unit_test #8620 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9324 percona-cluster-next for tealeg mp268238
    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/12262815/
Build: http://10.245.162.77:8080/job/charm_lint_check/9324/

charm_unit_test #8622 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_amulet_test #6234 percona-cluster-next for tealeg mp268238
    AMULET OK: passed

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

> N/F for the missing asserts about status, otherwise looks good.

It should now be good, utilising the outstanding code from charmhelpers to do status_get.

charm_unit_test #8932 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9714 percona-cluster-next for tealeg mp268238
    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/12328261/
Build: http://10.245.162.77:8080/job/charm_lint_check/9714/

charm_amulet_test #6339 percona-cluster-next for tealeg mp268238
    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/12329079/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6339/

charm_unit_test #9001 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #9773 percona-cluster-next for tealeg mp268238
    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/12337429/
Build: http://10.245.162.77:8080/job/charm_lint_check/9773/

charm_amulet_test #6355 percona-cluster-next for tealeg mp268238
    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/12338262/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6355/

charm_unit_test #9213 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #10047 percona-cluster-next for tealeg mp268238
    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/12417154/
Build: http://10.245.162.77:8080/job/charm_lint_check/10047/

charm_unit_test #9214 percona-cluster-next for tealeg mp268238
    UNIT OK: passed

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

charm_lint_check #10048 percona-cluster-next for tealeg mp268238
    LINT OK: passed

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

charm_amulet_test #6433 percona-cluster-next for tealeg mp268238
    AMULET OK: passed

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

charm_amulet_test #6434 percona-cluster-next for tealeg mp268238
    AMULET OK: passed

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

Looks good, thanks! +1

Looks good! Thanks for your contribution.