diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py
index 122e6199..c0b200f3 100644
--- a/runbot/__manifest__.py
+++ b/runbot/__manifest__.py
@@ -6,7 +6,7 @@
'author': "Odoo SA",
'website': "http://runbot.odoo.com",
'category': 'Website',
- 'version': '2.2',
+ 'version': '2.3',
'depends': ['website', 'base'],
'data': [
'security/runbot_security.xml',
diff --git a/runbot/models/branch.py b/runbot/models/branch.py
index 7bede4ea..a88607a4 100644
--- a/runbot/models/branch.py
+++ b/runbot/models/branch.py
@@ -25,7 +25,7 @@ class runbot_branch(models.Model):
state = fields.Char('Status')
modules = fields.Char("Modules to Install", help="Comma-separated list of modules to install and test.")
job_timeout = fields.Integer('Job Timeout (minutes)', help='For default timeout: Mark it zero')
- # test_tags = fields.Char("Test tags", help="Tags for the --test-tags params (same syntax)") # keep for next version
+ priority = fields.Boolean('Build priority', default=False)
@api.depends('name')
def _get_branch_name(self):
diff --git a/runbot/models/repo.py b/runbot/models/repo.py
index 763170ce..c932fea5 100644
--- a/runbot/models/repo.py
+++ b/runbot/models/repo.py
@@ -261,9 +261,9 @@ class runbot_repo(models.Model):
while testing < workers and pending > 0:
- # find sticky pending build if any, otherwise, last pending (by id, not by sequence) will do the job
+ # find sticky / priority pending build if any, otherwise, last pending (by id, not by sequence) will do the job
- pending_ids = Build.search(domain + [('state', '=', 'pending'), ('branch_id.sticky', '=', True)], limit=1)
+ pending_ids = Build.search(domain + [('state', '=', 'pending'), '|', ('branch_id.sticky', '=', True), ('branch_id.priority', '=', True)], limit=1)
if not pending_ids:
pending_ids = Build.search(domain + [('state', '=', 'pending')], order="sequence", limit=1)
diff --git a/runbot/views/branch_views.xml b/runbot/views/branch_views.xml
index 331a2f6b..1c20f338 100644
--- a/runbot/views/branch_views.xml
+++ b/runbot/views/branch_views.xml
@@ -15,6 +15,7 @@
+
@@ -37,6 +38,7 @@
+
@@ -57,4 +59,4 @@
action="open_view_branch_tree"
/>
-
\ No newline at end of file
+