jhbuild r2235 - in trunk: . buildbot jhbuild/buildbot

[fpeters svn gnome org]

Author: fpeters
Date: Thu Aug 14 20:08:03 2008
New Revision: 2235
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2235&view=rev

Log:
* jhbuild/buildbot/scheduler.py: added a project parameter to the
schedulers.
* master.cfg: pass a project parameter to the schedulers.



Modified:
   trunk/ChangeLog
   trunk/buildbot/ChangeLog
   trunk/buildbot/master.cfg
   trunk/jhbuild/buildbot/scheduler.py

Modified: trunk/buildbot/master.cfg
==============================================================================
--- trunk/buildbot/master.cfg	(original)
+++ trunk/buildbot/master.cfg	Thu Aug 14 20:08:03 2008
@@ -93,7 +93,7 @@
     s = None
     for project in c['projects']:
         buildername = "%s-%s" % (project, slave.slavename)
-        s = SerialScheduler(buildername, upstream=s,
+        s = SerialScheduler(buildername, project, upstream=s,
                             builderNames=[buildername])
         c['schedulers'].append(s)
 

Modified: trunk/jhbuild/buildbot/scheduler.py
==============================================================================
--- trunk/jhbuild/buildbot/scheduler.py	(original)
+++ trunk/jhbuild/buildbot/scheduler.py	Thu Aug 14 20:08:03 2008
@@ -23,16 +23,18 @@
 from buildbot.sourcestamp import SourceStamp
 from buildbot import buildset
 
-def SerialScheduler(name, builderNames, periodicBuildTimer=60*60*12, upstream=None, branch=None):
+def SerialScheduler(name, project, builderNames, periodicBuildTimer=60*60*12,
+        upstream=None, branch=None):
     if not upstream:
-        return StartSerial(name, builderNames, periodicBuildTimer, branch)
-    return Serial(name, upstream, builderNames, branch)
+        return StartSerial(name, project, builderNames, periodicBuildTimer, branch)
+    return Serial(name, project, upstream, builderNames, branch)
 
 class StartSerial(Periodic):
 
-    def __init__(self, name, builderNames, periodicBuildTimer,
+    def __init__(self, name, project, builderNames, periodicBuildTimer,
                  branch=None):
         Periodic.__init__(self,name,builderNames,periodicBuildTimer,branch)
+        self.project = project
         self.finishedWatchers = []
 
     def subscribeToFinishedBuilds(self, watcher):
@@ -54,8 +56,9 @@
     after the 'upstream' scheduler has completed (successfully or not)."""
     compare_attrs = ('name', 'upstream', 'builders', 'branch')
 
-    def __init__(self, name, upstream, builderNames, branch):
+    def __init__(self, name, project, upstream, builderNames, branch):
         BaseUpstreamScheduler.__init__(self, name)
+        self.project = project
         self.upstream = upstream
         self.branch = branch
         self.builderNames = builderNames