Merge lp://staging/~cprov/uci-engine/tarmac-multienv into lp://staging/uci-engine
Proposed by
Celso Providelo
| Status: | Merged |
|---|---|
| Approved by: | Celso Providelo |
| Approved revision: | 927 |
| Merged at revision: | 921 |
| Proposed branch: | lp://staging/~cprov/uci-engine/tarmac-multienv |
| Merge into: | lp://staging/uci-engine |
| Diff against target: |
359 lines (+111/-25) 15 files modified
bin/called-by-tarmac.py (+27/-4) juju-deployer/deploy.py (+3/-3) juju-deployer/relations.yaml (+3/-0) juju-deployer/services.yaml.tmpl (+13/-0) tests/deployers.py (+18/-0) tests/test_britney.py (+4/-10) tests/test_bsbuilder.py (+2/-0) tests/test_image_builder.py (+2/-0) tests/test_ppacreator.py (+2/-0) tests/test_publisher.py (+2/-0) tests/test_rabbit.py (+2/-0) tests/test_test_runner.py (+4/-0) tests/test_ticket_system.py (+1/-6) tests/test_validator.py (+2/-0) tests/test_webui.py (+26/-2) |
| To merge this branch: | bzr merge lp://staging/~cprov/uci-engine/tarmac-multienv |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vincent Ladeuil (community) | Approve | ||
| Francis Ginther | Needs Information | ||
|
Review via email:
|
|||
Commit message
Supporting multi-system deployment for tests.
Description of the change
Supporting multi-system deployment for tests.
`called-
`DeployerTest` was extended to require an specific service, if not available the test is skipped. Existing integration tests were adjusted.
In order to test the feature a minimal 'ci-ubuntucore' configuration was created for deploying rabbit, TR and Apache. There is also an integration test checking that the apache is alive but not configured (:-/).
To post a comment you must log in.
Revision history for this message
| Celso Providelo (cprov) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
A novel way to solve the problem. Just have a question inline.