NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] correctly skip builds when they get too old

Browse Source
This commit is contained in:
Gery Debongnie 2014-07-04 14:12:12 +02:00
parent 93e875ed20
commit 969f28f126
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runbot/runbot.py
View File

@ -265,10 +265,8 @@ class runbot_repo(osv.osv):
Build.create(cr, uid, v) Build.create(cr, uid, v)
# skip old builds (if their sequence number is too low, they will not ever be built) # skip old builds (if their sequence number is too low, they will not ever be built)
max_seq_id = Build.search(cr, uid, [('repo_id', '=', repo.id)], limit=1)[0] skippable_domain = [('repo_id', '=', repo.id), ('state', '=', 'pending')]
max_seq = Build.browse(cr, uid, max_seq_id).sequence to_be_skipped_ids = Build.search(cr, uid, skippable_domain, order='sequence', offset=repo.running)
skippable_domain = [('repo_id', '=', repo.id), ('state', '=', 'pending'), ('sequence', '<', max_seq - repo.running)]
to_be_skipped_ids = Build.search(cr, uid, skippable_domain)
Build.write(cr, uid, to_be_skipped_ids, {'state': 'done', 'result': 'skipped'}) Build.write(cr, uid, to_be_skipped_ids, {'state': 'done', 'result': 'skipped'})
def scheduler(self, cr, uid, ids=None, context=None): def scheduler(self, cr, uid, ids=None, context=None):
@ -281,9 +279,14 @@ class runbot_repo(osv.osv):
bo.schedule(cr, uid, build_ids) bo.schedule(cr, uid, build_ids)
# launch new tests # launch new tests
testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True) testing = bo.search_count(cr, uid, dom + [('state', '=', 'testing')])
while testing < repo.testing: while testing < repo.testing:
# select sticky build if any
# pending_ids = bo.search(cr, uid, dom + [('state', '=', 'pending')])
# select the next build to process # select the next build to process
pending_ids = bo.search(cr, uid, dom + [('state', '=', 'pending')]) pending_ids = bo.search(cr, uid, dom + [('state', '=', 'pending')])
if pending_ids: if pending_ids:
@ -305,7 +308,7 @@ class runbot_repo(osv.osv):
break break
# compute the number of testing job again # compute the number of testing job again
testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True) testing = bo.search_count(cr, uid, dom + [('state', '=', 'testing')])
# terminate and reap doomed build # terminate and reap doomed build
build_ids = bo.search(cr, uid, dom + [('state', '=', 'running')]) build_ids = bo.search(cr, uid, dom + [('state', '=', 'running')])