Merge lp://qastaging/~tealeg/charms/trusty/percona-cluster/pause-and-resume into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
- Trusty Tahr (14.04)
- pause-and-resume
- Merge into next
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 74 | ||||
Proposed branch: | lp://qastaging/~tealeg/charms/trusty/percona-cluster/pause-and-resume | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next | ||||
Diff against target: |
2140 lines (+1754/-89) 15 files modified
actions.yaml (+4/-0) actions/actions.py (+51/-0) charm-helpers-tests.yaml (+1/-0) charmhelpers/contrib/network/ip.py (+5/-1) charmhelpers/core/hookenv.py (+11/-9) charmhelpers/core/host.py (+32/-16) charmhelpers/core/kernel.py (+68/-0) tests/00-setup (+2/-0) tests/31-test-pause-and-resume.py (+38/-0) tests/charmhelpers/contrib/amulet/deployment.py (+4/-2) tests/charmhelpers/contrib/amulet/utils.py (+243/-52) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9) tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0) tests/charmhelpers/core/__init__.py (+15/-0) tests/charmhelpers/core/hookenv.py (+898/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~tealeg/charms/trusty/percona-cluster/pause-and-resume | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Glass (community) | Approve | ||
Adam Collard (community) | Approve | ||
Review via email: mp+268238@code.qastaging.launchpad.net |
Commit message
Description of the change
This branch adds pause and resume actions.
In addition to that central goal it also:
- includes an updated version of charmhelpers
- defines tests for the actions.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #8197 percona-
LINT OK: passed
Ryan Beisner (1chb1n) wrote : | # |
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/
If there are non-OpenStack-
Feel free to holler with any questions. Thanks again!
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #5843 percona-
AMULET OK: passed
Build: http://
Geoff Teale (tealeg) wrote : | # |
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/
>
> If there are non-OpenStack-
> in other charm tests, please land those in
> charmhelpers/
>
> Feel free to holler with any questions. Thanks again!
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #7817 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #8423 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #5930 percona-
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://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
Looks like the 00-setup needs to be updated. We ran into that dep issue elsewhere.
This should be the ticket:
http://
Ryan Beisner (1chb1n) wrote : | # |
Otherwise, pending passing tests, looks good to me. Thank you for your work on this!
Geoff Teale (tealeg) wrote : | # |
Cheers Ryan, will do!
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #8477 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #7868 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #7869 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #8478 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #5936 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #5938 percona-
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://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
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.
Geoff Teale (tealeg) wrote : | # |
> 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.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9091 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8400 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9092 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8401 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6147 percona-
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://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
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://
Geoff Teale (tealeg) wrote : | # |
> 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://
> amulet-
Hi Ryan,
It should already have exactly that content as I've merged in the most recent percona-
Geoff Teale (tealeg) wrote : | # |
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-
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8463 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9157 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6169 percona-
AMULET OK: passed
Build: http://
Adam Collard (adam-collard) wrote : | # |
N/F for the missing asserts about status, otherwise looks good.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8529 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9228 percona-
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6190 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9239 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8540 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9242 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8543 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6201 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9321 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8620 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9324 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8622 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6234 percona-
AMULET OK: passed
Build: http://
Geoff Teale (tealeg) wrote : | # |
> 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.
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #8932 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9714 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6339 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #9001 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #9773 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6355 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #9213 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #10047 percona-
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #9214 percona-
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #10048 percona-
LINT OK: passed
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6433 percona-
AMULET OK: passed
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #6434 percona-
AMULET OK: passed
Build: http://
Adam Collard (adam-collard) wrote : | # |
Looks good, thanks! +1
Chris Glass (tribaal) wrote : | # |
Looks good! Thanks for your contribution.
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/