Merge lp://staging/~vila/ubuntu-ci-services-itself/run-workers into lp://staging/ubuntu-ci-services-itself

Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 316
Merged at revision: 315
Proposed branch: lp://staging/~vila/ubuntu-ci-services-itself/run-workers
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 121 lines (+11/-14)
6 files modified
ci-utils/ci_utils/nova_client/__init__.py (+5/-5)
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)
test_runner/tstrun/testbed.py (+2/-5)
To merge this branch: bzr merge lp://staging/~vila/ubuntu-ci-services-itself/run-workers
Reviewer Review Type Date Requested Status
Evan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+209431@code.staging.launchpad.net

Commit message

Rename run_workers scripts to make them unique for python across the components.

Description of the change

Inspired by https://code.launchpad.net/~ev/ubuntu-ci-services-itself/wider-pyflakes-coverage/+merge/207801 this make us better python citizens by putting the run_worker scripts in a place where they can't conflict when imported.

It also fixes some additional pep8 issues.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:316
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vila/ubuntu-ci-services-itself/run-workers/+merge/209431/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/298/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/298/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Evan (ev) wrote :

Great stuff! +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches