Mercurial > hg > autobot

changeset 151:700693fad00a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup a few things found in testing multiple builders
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 25 Jan 2011 08:23:33 -0800
parents 03536656932a
children b1126ab39a4c
files autobot/changes/poller.py autobot/config.py autobot/template/master/master.cfg autobot/template/master/master.ini
diffstat 4 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/autobot/changes/poller.py	Mon Jan 24 18:28:12 2011 -0800
+++ b/autobot/changes/poller.py	Tue Jan 25 08:23:33 2011 -0800
@@ -60,7 +60,7 @@
         if not self.workdir:
             self.workdir = tempfile.mkdtemp()
 
-        self.name = self.__class__.__name__
+        self.name = '%s: %s#%s' % (self.__class__.__name__, repourl, branch)
 
 #     def startService(self):
 
--- a/autobot/config.py	Mon Jan 24 18:28:12 2011 -0800
+++ b/autobot/config.py	Tue Jan 25 08:23:33 2011 -0800
@@ -37,12 +37,14 @@
                 slave_dict = self.master.copy()
                 slave_dict.update(self.section_dict(section))
                 assert 'password' in slave_dict, 'Slave %s: must provide a password'
-                factories = slave_dict.get('factories', '')
-                factories = factories.split()
-                if factories == ['']:
-                    factories = []
+                _factories = slave_dict.get('factories', '')
+                _factories = _factories.split()
+                if _factories == ['']:
+                    _factories = []
+                if _factories == ['*']:
+                    _factories = factories.keys()
                 self.slaves[name] = {'password': slave_dict['password'],
-                                     'factories': factories }
+                                     'factories': _factories }
                 continue
             
             # get factories
--- a/autobot/template/master/master.cfg	Mon Jan 24 18:28:12 2011 -0800
+++ b/autobot/template/master/master.cfg	Tue Jan 25 08:23:33 2011 -0800
@@ -57,7 +57,7 @@
 from buildbot.changes.gitpoller import GitPoller
 from autobot.changes.poller import HgPoller
 
-pollInterval = 30
+pollInterval = int(config.master.get('pollInterval', 60))
 
 for repourl, branch in sources['git']:
     c['change_source'].append(GitPoller(
@@ -79,7 +79,7 @@
 buildernames = [i['name'] for i in builders]
 c['schedulers'] = []
 
-treeStableTimer = 1
+treeStableTimer = int(config.master.get('treeStableTimer', 60))
 
 for (source, branch), buildernames in builder_sources.items():
     change_filter = ChangeFilter(repository=source, branch=branch)
--- a/autobot/template/master/master.ini	Mon Jan 24 18:28:12 2011 -0800
+++ b/autobot/template/master/master.ini	Tue Jan 25 08:23:33 2011 -0800
@@ -3,5 +3,7 @@
 password  = {{passwd}}
 slaveport = {{slaveport}}
 htmlport  = {{htmlport}}
+pollInterval = 30
+treeStableTimer = 30
 
 [slave:{{slave}}]
\ No newline at end of file