Bug 489352. Split up the HgPollers across branches. r=me
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Mon, 27 Apr 2009 14:58:13 -0400
changeset 1120 b0f5882552b069dfa2a87c98f085190f921c7716
parent 1119 013b4bd8d9e938ec655dcbb46a1ed5b3a914f940
child 1121 44cb4fec2f2bf31191e1f5a9912190b173da3316
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersme
bugs489352
Bug 489352. Split up the HgPollers across branches. r=me
thunderbird/master.cfg
thunderbird/mozillabuild.py
--- a/thunderbird/master.cfg
+++ b/thunderbird/master.cfg
@@ -21,17 +21,17 @@ import config
 reload(config)
 from config import *
 
 import os
 debug = os.environ.get('DEBUG')
 
 from buildbot import locks
 from buildbot.process import factory
-from buildbot.scheduler import Scheduler, Nightly, Periodic, Triggerable
+from buildbot.scheduler import Scheduler, Nightly, Periodic, Triggerable, AnyBranchScheduler
 from buildbot.status.tinderbox import TinderboxMailNotifier
 from buildbot.status.words import IRC
 from buildbot.steps.source import Mercurial
 from buildbot.steps.shell import Compile, ShellCommand, WithProperties, TreeSize
 
 from buildbot.changes.pb import PBChangeSource
 
 import buildbotcustom.changes.hgpoller
@@ -168,19 +168,20 @@ for name in BRANCHES.keys():
             '%s%s/raw-file/default/%s/locales/all-locales' % (HGURL, hg_branch, product),
             '%s/pushlog' % LOCALE_REPO_URL,
             branch='%s-l10n' % name,
             pollInterval=180,
         ))
 
     # schedulers
     # this one gets triggered by the HG Poller
-    c['schedulers'].append(Scheduler(
+    add_poll_branches = getConfig(DEFAULTS, branch, 'add_poll_branches')
+    c['schedulers'].append(AnyBranchScheduler(
         name=name,
-        branch=hg_branch,
+        branches=[hg_branch, mozilla_branch] + add_poll_branches,
         treeStableTimer=3*60,
         builderNames=builders
     ))
     c['schedulers'].append(Nightly(
         name='%s nightly' % name,
         branch=hg_branch,
         hour=[3],
         builderNames=nightlyBuilders
@@ -279,18 +280,17 @@ for name in BRANCHES.keys():
             flunkOnFailure=False,
             timeout=3600, # One hour, because Windows is slow
         )
         #Clobber support end
 
 
         mozilla2_dep_factory.addStep(Mercurial(
             mode='update',
-            baseURL=HGURL,
-            defaultBranch=hg_branch,
+            repourl="%s%s" % (HGURL, hg_branch),
             alwaysUseLatest=True,
             timeout=60*60,
         ))
         changesetLink = '<a href=%s%s/rev' % (HGURL, hg_branch)
         changesetLink += '/%(got_revision)s title="Built from revision %(got_revision)s">rev:%(got_revision)s</a>'
         mozilla2_dep_factory.addStep(ShellCommand(
             command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
         ))
@@ -442,18 +442,17 @@ for name in BRANCHES.keys():
                      'rm', '-rfv', '{}', ';'],
             env=pf['env'],
             workdir='.',
             description=['cleanup', 'old', 'symbols'],
             flunkOnFailure=False,
         ))
         mozilla2_nightly_factory.addStep(Mercurial(
             mode='clobber',
-            baseURL=HGURL,
-            defaultBranch=hg_branch,
+            repourl="%s%s" % (HGURL, hg_branch),
             timeout=60*60,
         ))
         changesetLink = '<a href=%s%s/rev' % (HGURL, hg_branch)
         changesetLink += '/%(got_revision)s title="Built from revision %(got_revision)s">rev:%(got_revision)s</a>'
         mozilla2_nightly_factory.addStep(ShellCommand(
             command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
         ))
         mozilla2_nightly_factory.addStep(ShellCommand(
--- a/thunderbird/mozillabuild.py
+++ b/thunderbird/mozillabuild.py
@@ -22,11 +22,11 @@ def setupHGPollersFromBranches(defaults,
             pushlogUrlOverride = '%s/%s/pushlog' % (hgurl, b),
             if not sources.get(b):
                 sources[b] = pushlogUrlOverride
 
     for branch in sorted(sources.keys()):
         change_source.append(HgPoller(
             hgURL=hgurl,
             pushlogUrlOverride="%s/%s/pushlog" % (hgurl,branch),
-            branch=fixed_branch,
+            branch=branch,
             pollInterval=1*60
         ))