Merge lp://qastaging/~doanac/uci-engine/worker-logs into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 603
Merged at revision: 602
Proposed branch: lp://qastaging/~doanac/uci-engine/worker-logs
Merge into: lp://qastaging/uci-engine
Diff against target: 142 lines (+48/-12)
6 files modified
charms/precise/rabbitmq-worker/hooks/hooks.py (+10/-4)
tests/deployers.py (+4/-1)
tests/test_bsbuilder.py (+31/-0)
tests/test_image_builder.py (+1/-2)
tests/test_publisher.py (+1/-3)
tests/test_test_runner.py (+1/-2)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/worker-logs
Reviewer Review Type Date Requested Status
Evan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+224206@code.qastaging.launchpad.net

Commit message

rabbit-worker charm: update logs directory

This makes the upstart logging location for our rabbit workers consistent
to what i/s requires. The log directories will become:

 /srv/ci-airline-imagebuild-worker/logs/upstart.log
 /srv/ci-airline-bsb-worker/logs/upstart.log

 etc.

This had a side-effect of changing the upstart service names, which
I fixed the integration test cases for (as well as added one for
bsbuilder since one didn't exist)

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

PASSED: Continuous integration, rev:602
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/914/
Executed test runs:

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

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

One small problem mentioned inline. Otherwise, +1.

review: Approve
603. By Andy Doan

append to log file as per ev

Revision history for this message
Andy Doan (doanac) wrote :

On 06/23/2014 04:49 PM, Evan Dandrea wrote:
>> + exec su -c "{main}" {uid} >{logdir}/upstart.log 2>&1
> Shouldn't this be >> ?
>

indeed. it originally was. i must have copy/pasted wrong somewhere.
great catch. fixed in revno 603

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