Merge lp://qastaging/~simpoir/landscape-charm/juju-deploy-err into lp://qastaging/~landscape/landscape-charm/trunk
Proposed by
Simon Poirier
| Status: | Merged |
|---|---|
| Approved by: | Simon Poirier |
| Approved revision: | 405 |
| Merged at revision: | 405 |
| Proposed branch: | lp://qastaging/~simpoir/landscape-charm/juju-deploy-err |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
328 lines (+68/-43) 8 files modified
Makefile (+7/-11) README.md (+2/-4) dev/deploy-landscape-client (+3/-3) dev/deployer (+15/-16) dev/ubuntu-deps (+4/-4) lib/tests/test_install.py (+1/-1) tests/basic/test_service.py (+11/-0) tests/helpers.py (+25/-4) |
| To merge this branch: | bzr merge lp://qastaging/~simpoir/landscape-charm/juju-deploy-err |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Maximiliano Bertacchini | Approve | ||
|
Review via email:
|
|||
Commit message
Replace juju-deployer by plain "juju deploy" in integration tests to allow testing on bionic.
Description of the change
This branch gives some love to charm integration tests.
This should allow integration-tests to run on top of bionic (current release).
(focal won't run yet because there are still bits of python27 in there)
* get rid of juju-deployer, which is most definitely broken/dead
* mild PY3 compat fixes
* some unbroken tests
For testing, it assumes you have a juju model accessible.
So I encourage setting lxd config security.
running this in a container (and you should) and doing a juju bootstrap.
FWIW xenial still deploys and passes tests, though it's not a supported
series for recent landscape release.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me! Locally tested test, test-depends, integration-test, bundles-