Merge lp://qastaging/~bjornt/landscape-charm/integration-tests-dense-maas into lp://qastaging/~landscape/landscape-charm/trunk
Proposed by
Björn Tillenius
Status: | Merged |
---|---|
Approved by: | Björn Tillenius |
Approved revision: | 324 |
Merged at revision: | 354 |
Proposed branch: | lp://qastaging/~bjornt/landscape-charm/integration-tests-dense-maas |
Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
Diff against target: |
134 lines (+56/-9) 3 files modified
HACKING.md (+38/-7) Makefile (+1/-1) tests/helpers.py (+17/-1) |
To merge this branch: | bzr merge lp://qastaging/~bjornt/landscape-charm/integration-tests-dense-maas |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther (community) | Approve | ||
David Britton (community) | Approve | ||
🤖 Landscape Builder | test results | Approve | |
Review via email:
|
Commit message
Allow the integration tests to be run on a dense MAAS deploy,
using LXCs on machine 0.
Description of the change
Allow the integration tests to be run on a dense MAAS deploy,
using LXCs on machine 0.
Testing instructions:
See the changes to HACKING.md
Note that the integration tests are currently broken on xenial. I would
propose bootstrapping the environment manually and then run:
DENSE_MAAS=1 LS_CHARM_
--path tests --tests-pattern basic --test test_bootstrap
To post a comment you must log in.
Command: make ci-test /ci.lscape. net/job/ latch-test/ 5210/
Result: Success
Revno: 323
Branch: lp:~bjornt/landscape-charm/integration-tests-dense-maas
Jenkins: https:/