Merge lp://staging/~doanac/ubuntu-ci-services-itself/run-workers-fix into lp://staging/ubuntu-ci-services-itself
Proposed by
Andy Doan
Status: | Merged |
---|---|
Merged at revision: | 320 |
Proposed branch: | lp://staging/~doanac/ubuntu-ci-services-itself/run-workers-fix |
Merge into: | lp://staging/ubuntu-ci-services-itself |
Diff against target: |
194 lines (+57/-27) 9 files modified
branch-source-builder/bsbuilder/run_worker.py (+2/-6) image-builder/imagebuilder/run_worker.py (+0/-3) juju-deployer/branch-source-builder.yaml.tmpl (+1/-1) juju-deployer/image-builder.yaml.tmpl (+1/-1) juju-deployer/lander.yaml.tmpl (+1/-1) juju-deployer/test-runner.yaml.tmpl (+1/-1) lander/lander/run_worker.py (+1/-4) run-python (+46/-0) test_runner/tstrun/run_worker.py (+4/-10) |
To merge this branch: | bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/run-workers-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
fix broken run-worker change
revno(315) caused a regression because all the run-worker scripts
were dealing with sys.path in order to import things properly. This
patch adds a new "run-python" script that will launch the worker
scripts with the proper PYTHONPATH.
Description of the change
This fixes the run-workers regression I noted earlier on our mailing list.
I created a new "run-python" script that we can use to launch python code we have that requires ci-utils in the path. This allowed some simplification to all the run_worker.py files.
To post a comment you must log in.
FAILED: Continuous integration, rev:318 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/303/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/303/ rebuild
http://