From 942a66cd0db9c7992402fff749810200dc45b8e0 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 7 Oct 2014 11:03:37 +0000 Subject: [PATCH 1/4] buildmaster: trying different scheduler --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index fa3c405354..c7fbf886a1 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -79,21 +79,19 @@ c['schedulers'] = [] c['schedulers'].append(JobScheduler( name="jobsched-noarch", builderNames=["all"], - fileIsImportant=None, treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='noarch'))) c['schedulers'].append(JobScheduler( name="jobsched-i386", builderNames=['i386'], - fileIsImportant=None, treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='i386'))) -c['schedulers'].append(JobScheduler( +c['schedulers'].append(SingleBranchScheduler( name="jobsched-x86_64", builderNames=['x86_64'], - fileIsImportant=None, treeStableTimer=None, + treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='x86_64'))) From 74f382d69d5f5ddb8e87434cdeab014f752c66c1 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 7 Oct 2014 13:21:34 +0000 Subject: [PATCH 2/4] buildmaster: use custom gotChange in JobScheduler --- .../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 c7fbf886a1..168e8a6d2f 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -75,6 +75,11 @@ class JobScheduler(BaseBasicScheduler): return self.master.db.schedulers.getChangeClassifications( self.objectid) + @util.deferredLocked('_stable_timers_lock') + def gotChange(self, change, important): + return self.addBuildsetForChanges(reason=self.reason, changeids=[change.number]) + + c['schedulers'] = [] c['schedulers'].append(JobScheduler( name="jobsched-noarch", @@ -88,10 +93,9 @@ c['schedulers'].append(JobScheduler( change_filter=filter.ChangeFilter(project='rpmcheck', category='i386'))) -c['schedulers'].append(SingleBranchScheduler( +c['schedulers'].append(JobScheduler( name="jobsched-x86_64", builderNames=['x86_64'], - treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='x86_64'))) From 7cc155f67d0ef0d824d90e559dad1ed50128d072 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 7 Oct 2014 13:28:27 +0000 Subject: [PATCH 3/4] buildmaster: add missing import --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 168e8a6d2f..0a59398663 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -58,6 +58,7 @@ from buildbot.schedulers.basic import SingleBranchScheduler from buildbot.schedulers.forcesched import ForceScheduler, StringParameter from buildbot.changes import filter from buildbot.schedulers.basic import BaseBasicScheduler +from buildbot import util class JobScheduler(BaseBasicScheduler): From f52b94dbe952358a6e5f8ea533d64bc1977e0044 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 7 Oct 2014 14:28:51 +0000 Subject: [PATCH 4/4] buildmaster: do not merge requests --- .../templates/taskotron.master.cfg.j2 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 0a59398663..06724ea5e1 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -76,10 +76,6 @@ class JobScheduler(BaseBasicScheduler): return self.master.db.schedulers.getChangeClassifications( self.objectid) - @util.deferredLocked('_stable_timers_lock') - def gotChange(self, change, important): - return self.addBuildsetForChanges(reason=self.reason, changeids=[change.number]) - c['schedulers'] = [] c['schedulers'].append(JobScheduler( @@ -97,6 +93,7 @@ c['schedulers'].append(JobScheduler( c['schedulers'].append(JobScheduler( name="jobsched-x86_64", builderNames=['x86_64'], + treeStableTimer=None, change_filter=filter.ChangeFilter(project='rpmcheck', category='x86_64'))) @@ -190,7 +187,8 @@ c['builders'] = [] c['builders'].append( BuilderConfig(name="x86_64", slavenames=[{% for buildslave in x86_64_buildslaves %}"{{ buildslave }}",{% endfor %}], - factory=factory, locks=[build_lock.access('counting')])) + factory=factory, locks=[build_lock.access('counting')], + mergeRequests=False)) c['builders'].append( BuilderConfig(name="i386",