Merge lp://staging/~vila/ubuntu-ci-services-itself/1287740-deps-first into lp://staging/ubuntu-ci-services-itself
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Evan | ||||||||
| Approved revision: | 323 | ||||||||
| Merged at revision: | 327 | ||||||||
| Proposed branch: | lp://staging/~vila/ubuntu-ci-services-itself/1287740-deps-first | ||||||||
| Merge into: | lp://staging/ubuntu-ci-services-itself | ||||||||
| Diff against target: |
427 lines (+145/-89) 12 files modified
.bzrignore (+2/-0) branch-source-builder/bsbuilder/resources/v1.py (+1/-1) branch-source-builder/bsbuilder/tests/test_v1.py (+1/-1) branches/README (+6/-0) image-builder/imagebuilder/resources/v1.py (+1/-1) juju-deployer/deploy.py (+89/-67) juju-deployer/test_deploy.py (+7/-3) ppa-assigner/ppa_assigner/api.py (+1/-1) tests/run.py (+28/-10) tests/test_run.py (+7/-3) ticket_system/ticket/api.py (+1/-1) ticket_system/ticket_system/urls.py (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://staging/~vila/ubuntu-ci-services-itself/1287740-deps-first | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Evan (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Reduce payload size and use local (and persistent) branches for dependencies running from source.
Description of the change
This fixes bug #1287740 and bug #1288673.
This uses local branches for the dependencies we run from source and put the
dependency dirs in front of PYTHONPATH and PATH to ensure we use them
instead of locally installed ones.
Using local branches allows local debugging of said dependencies from a
branch and avoid fully downloading them at each deployment.
This proposal also reduces the payload we upload to swift by including only
the files under version control (this avoid uploading the local branches
above and anything we (devs) may have in the working tree). For me, that
means uploading 2.7M instead of up to 60M which makes a significant
difference when doing a deployment (roughly 1min (ymmv) to upload instead
of.... up to an hour maybe, I've stopped tracking precisely :-/).
As discussed already with Andy and Evan, I'm aware that not uploading .bzr
breaks a few bits, I'll file bugs for that once/if this lands.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
FAILED: Continuous integration, rev:322
http://
Executed test runs:
Click here to trigger a rebuild:
http://