From 47239d5c570b3e76000ecc2f469559244e283411 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 8 Oct 2014 08:46:23 +0000 Subject: [PATCH] buildmaster: do not merge requests in all builders --- .../templates/taskotron.master.cfg.j2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 06724ea5e1..ea63dc31ca 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -81,12 +81,14 @@ c['schedulers'] = [] c['schedulers'].append(JobScheduler( name="jobsched-noarch", builderNames=["all"], + treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='noarch'))) c['schedulers'].append(JobScheduler( name="jobsched-i386", builderNames=['i386'], + treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='i386'))) @@ -193,12 +195,14 @@ c['builders'].append( c['builders'].append( BuilderConfig(name="i386", slavenames=[{% for buildslave in i386_buildslaves %}"{{ buildslave }}",{% endfor %}], - factory=factory, locks=[build_lock.access('counting')])) + factory=factory, locks=[build_lock.access('counting')], + mergeRequests=False)) c['builders'].append( BuilderConfig(name="all", slavenames=[{% for buildslave in buildslaves %}"{{ buildslave }}",{% endfor %}], - factory=factory, locks=[build_lock.access('counting')])) + factory=factory, locks=[build_lock.access('counting')], + mergeRequests=False)) ####### STATUS TARGETS