Merge lp:~linaro-infrastructure/cbuild/cbuild-tools_cbuild-lava into lp:~linaro-toolchain-dev/cbuild/tools

Proposed by Paul Sokolovsky
Status: Merged
Approved by: Matthew Gretton-Dann
Approved revision: 92
Merged at revision: 98
Proposed branch: lp:~linaro-infrastructure/cbuild/cbuild-tools_cbuild-lava
Merge into: lp:~linaro-toolchain-dev/cbuild/tools
Diff against target: 32 lines (+7/-4)
2 files modified
chain.sh (+4/-1)
spawn.sh (+3/-3)
To merge this branch: bzr merge lp:~linaro-infrastructure/cbuild/cbuild-tools_cbuild-lava
Reviewer Review Type Date Requested Status
Matthew Gretton-Dann Approve
Linaro Infrastructure Pending
Paul Sokolovsky Pending
Review via email: mp+143278@code.launchpad.net

This proposal supersedes a proposal from 2013-01-08.

Description of the change

Additional code for LAVA integration with automatic build scheduling scripts. These changes depend on changes to tcwg-web.
See commit comments for more details.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote : Posted in a previous version of this proposal

Looks good to me.

It only takes a little bit of time to go through the code, since is divided into multiple branches and some of the variables used here are defined elsewhere.

Revision history for this message
Paul Sokolovsky (pfalcon) wrote : Posted in a previous version of this proposal

Yes, CBuild is over-split even per my opinion (I generally like clean module separation, even on SCM level). But this is indeed simple, but fully dependent on tcwg-web changes of course.

review: Approve
Revision history for this message
Matthew Gretton-Dann (matthew-gretton-dann) wrote :

Approved. Do not merge until the tcwg-web changes have been merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'chain.sh'
2--- chain.sh 2012-12-10 20:04:20 +0000
3+++ chain.sh 2013-01-15 11:21:22 +0000
4@@ -43,7 +43,10 @@
5 function spawn {
6 target=$queue/$2/$1.job
7
8- [ ! -f $target ] && $run touch $target && echo Spawned $1 into $2
9+ if [ ! -f $target ]; then
10+ PYTHONPATH=$lib/tcwg-web python -m schedulejob $2 $1
11+ echo Spawned $1 into $2
12+ fi
13 }
14
15 function chain {
16
17=== modified file 'spawn.sh'
18--- spawn.sh 2012-12-02 22:19:54 +0000
19+++ spawn.sh 2013-01-15 11:21:22 +0000
20@@ -28,9 +28,9 @@
21
22 echo Spawning $job into the queue `basename $closest`
23
24-# Grab the template, or failing that just touch
25+# "Demux" via spawn queue into real job queues, use tcwg-web's schedulejob.py
26+# script for scheduling jobs with LAVA support, etc.
27 for i in $closest/*; do
28- [ -f $i/template.txt ] && cat $i/template.txt > $i/$job.job
29- [ -f $i/template.txt ] || touch $i/$job.job
30+ PYTHONPATH=$lib/tcwg-web python -m schedulejob `basename $i` $job
31 echo Spawned into `basename $i`
32 done

Subscribers

People subscribed via source and target branches