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
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+209583@code.staging.launchpad.net

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:318
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/303/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

Damn damn damn !

Sorry for the mess :-(

Thanks Andy for the prompt reaction !

And additional thanks for not reverting my bogus change :-/

I agree we shouldn't mess around with sys.path in this way, it's a smell that both our layout and dependency story needs to be improved.

Let's land this asap and work on sorting out how we can get rid of all this sys.path torture.

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (101.5 KiB)

The attempt to merge lp:~doanac/ubuntu-ci-services-itself/run-workers-fix into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.VyL2Tr9E7P/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Unpacking /tmp/tarmac/branch.n2jsZC/.deps/Babel-1.3.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.n2jsZC/.deps/Babel-1.3.tar.gz

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Installing collected packages: Babel
  Running setup.py install for Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
    Installing pybabel script to /tmp/tmp.VyL2Tr9E7P/bin
Successfully installed Babel
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.n2jsZC/.deps/pbr-0.6.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.n2jsZC/.deps/pbr-0.6.tar.gz
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Installing collected packages: pbr
  Running setup.py install for pbr
    [pbr] Reusing existing SOURCES.txt
Successfully installed pbr
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.n2jsZC/.deps/iso8601-0.1.8.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.n2jsZC/.deps/iso8601-0.1.8.tar.gz

Installing collected packages: iso8601
  Running setup.py install for iso8601

Successfully installed iso8601
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.n2jsZC/.deps/prettytable-0.7.2.zip
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.n2jsZC/.deps/prettytable-0.7.2.zip

Installing collected packages: pretty...

Revision history for this message
Vincent Ladeuil (vila) wrote :

Of course an MP fixing bugs in an untested MP *has* to fail tests... :-}

See https://code.launchpad.net/~vila/ubuntu-ci-services-itself/run-workers-fix/+merge/209623 instead filed to land asap.

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