Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

buildmaster: do not merge requests

Browse source
This commit is contained in:
Martin Krizek 2014-10-07 14:28:51 +00:00
parent 7cc155f67d
commit f52b94dbe9
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -76,10 +76,6 @@ class JobScheduler(BaseBasicScheduler):
return self.master.db.schedulers.getChangeClassifications( return self.master.db.schedulers.getChangeClassifications(
self.objectid) 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'] = []
c['schedulers'].append(JobScheduler( c['schedulers'].append(JobScheduler(
@ -97,6 +93,7 @@ c['schedulers'].append(JobScheduler(
c['schedulers'].append(JobScheduler( c['schedulers'].append(JobScheduler(
name="jobsched-x86_64", name="jobsched-x86_64",
builderNames=['x86_64'], builderNames=['x86_64'],
treeStableTimer=None,
change_filter=filter.ChangeFilter(project='rpmcheck', change_filter=filter.ChangeFilter(project='rpmcheck',
category='x86_64'))) category='x86_64')))
@ -190,7 +187,8 @@ c['builders'] = []
c['builders'].append( c['builders'].append(
BuilderConfig(name="x86_64", BuilderConfig(name="x86_64",
slavenames=[{% for buildslave in x86_64_buildslaves %}"{{ buildslave }}",{% endfor %}], 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( c['builders'].append(
BuilderConfig(name="i386", BuilderConfig(name="i386",