Merge lp://staging/~sinzui/juju-ci-tools/obsolete-joyent-pid into lp://staging/juju-ci-tools
Status: | Merged |
---|---|
Merged at revision: | 1010 |
Proposed branch: | lp://staging/~sinzui/juju-ci-tools/obsolete-joyent-pid |
Merge into: | lp://staging/juju-ci-tools |
Diff against target: |
92 lines (+2/-42) 2 files modified
joyent.py (+0/-16) test_joyent.py (+2/-26) |
To merge this branch: | bzr merge lp://staging/~sinzui/juju-ci-tools/obsolete-joyent-pid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John George (community) | Approve | ||
Review via email: mp+263583@code.staging.launchpad.net |
Description of the change
Remove calls to delete joyent-juju procs
I saw false test failures yesterday because the joyent code wrongly matched processes on my local machine that happened to have the words "juju" and "joyent". I considered writing a more accurate match for long running joyent tests, but it doesn't really work anymore
When I wrote the feature more than a year ago, we had only ci-master and canonistack-slave, and all joyent tests ran from ci-master. This isn't true anymore. We run some jobs from other machines. We also run all jobs with a timeout. The joyent cleanup job that once ran every two hours has been off for 5 months because it we don't have old procs and envs running.
thanks