From 74f382d69d5f5ddb8e87434cdeab014f752c66c1 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 7 Oct 2014 13:21:34 +0000 Subject: [PATCH] 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')))