Move configs, stage base path to production targets
authorbhearsum@bitters.local
Wed, 13 Feb 2008 16:02:01 -0500
changeset 1 b01dfcc3e68f456217501ea006fdf19887ad3a09
parent 0 584471372a7e1820758e50b1b5938ee7b46e7d72
child 2 060ad80d71c735d3098be088d2c5c0d7f5a4f7f6
push id1
push userbhearsum@mozilla.com
push dateMon, 07 Apr 2008 12:22:19 +0000
Move configs, stage base path to production targets
mozilla2/master.cfg
--- a/mozilla2/master.cfg
+++ b/mozilla2/master.cfg
@@ -16,46 +16,56 @@ c['slaves'] = BuildSlaves.SlaveList
 c['slavePortnum'] = 9989
 
 
 ####### SCHEDULERS, CHANGE SOURCES, AND BUILDERS
 
 HGURL = 'http://hg.mozilla.org/'
 # for nss/nspr
 CVSROOT = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
-# TODO: update this after production repo is created
 CONFIG_REPO_URL = 'http://hg.mozilla.org/build/buildbot-configs/mozilla2'
 OBJDIR = 'obj-firefox'
 STAGE_USERNAME = 'ffxbld'
 STAGE_SERVER = 'stage.mozilla.org'
-# TODO: update this soon
-STAGE_BASE_PATH = '/home/ffxbld/moz2-builds'
+STAGE_BASE_PATH = '/home/ftp/pub/firefox'
 STAGE_GROUP = None
 STAGE_SSH_KEY = 'ffxbld_dsa'
-BRANCHES = {'mozilla-central': {}}
+BRANCHES = {'mozilla-central': {}, 'actionmonkey': {}}
 BRANCHES['mozilla-central']['platforms'] = {'linux': {}, 'win32': {}, 'macosx': {}}
 BRANCHES['mozilla-central']['platforms']['linux']['slaves'] = ['moz2-linux-slave1']
 BRANCHES['mozilla-central']['platforms']['win32']['slaves'] = ['moz2-win32-slave1']
 BRANCHES['mozilla-central']['platforms']['macosx']['slaves'] = ['moz2-mac-slave1']
 BRANCHES['mozilla-central']['platforms']['linux']['env'] = {
     'MOZ_OBJDIR': OBJDIR
 }
 BRANCHES['mozilla-central']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR
 }
 BRANCHES['mozilla-central']['platforms']['macosx']['env'] = {
     'MOZ_OBJDIR': OBJDIR
 }
+BRANCHES['actionmonkey']['platforms'] = {'linux': {}, 'win32': {}, 'macosx': {}}
+BRANCHES['actionmonkey']['platforms']['linux']['slaves'] = ['moz2-linux-slave1']
+BRANCHES['actionmonkey']['platforms']['win32']['slaves'] = ['moz2-win32-slave1']
+BRANCHES['actionmonkey']['platforms']['macosx']['slaves'] = ['moz2-mac-slave1']
+BRANCHES['actionmonkey']['platforms']['linux']['env'] = {
+    'MOZ_OBJDIR': OBJDIR
+}
+BRANCHES['actionmonkey']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
+    'MOZ_OBJDIR': OBJDIR
+}
+BRANCHES['actionmonkey']['platforms']['macosx']['env'] = {
+    'MOZ_OBJDIR': OBJDIR
+}
 
 
 from buildbot.process import factory
 from buildbot.changes.hgpoller import HgPoller
 from buildbot.scheduler import Scheduler, Nightly, Periodic
 from buildbot.steps.source import Mercurial
-from buildbot.steps.transfer import FileDownload
 from buildbot.steps.shell import Compile, ShellCommand, WithProperties
 from buildbot.locks import SlaveLock
 
 import buildbotcustom
 reload(buildbotcustom)
 
 from buildbotcustom.steps.misc import GetBuildID
 from buildbotcustom.steps.transfer import MozillaStageUpload
@@ -78,22 +88,29 @@ for name in BRANCHES.keys():
     # change sources
     c['sources'].append(HgPoller(
         hgURL=HGURL,
         branch=name,
         pollInterval=1*60
     ))
 
     # schedulers
+    # this one gets triggered by the HG Poller
     c['schedulers'].append(Scheduler(
         name=name,
         branch=name,
         treeStableTimer=3*60,
         builderNames=builders
     ))
+    c['schedulers'].append(Periodic(
+        name='name periodic' % name,
+        branch=name,
+        periodicBuildTimer=60*60,
+        builderNames=builders
+    ))
     c['schedulers'].append(Nightly(
         name='%s nightly' % name,
         branch=name,
         hour=[2],
         builderNames=nightlyBuilders
     ))
 
     for platform in branch['platforms'].keys():
@@ -244,24 +261,29 @@ for name in BRANCHES.keys():
         c['builders'].append(mozilla2_nightly_builder)
 
 
 ####### STATUS TARGETS
 
 c['status'] = []
 
 from buildbot.status import html
+from buildbot.status.tinderbox import TinderboxMailNotifier
 
 # This one's private.
 c['status'].append(html.WebStatus(
     http_port=8010, allowForce=True
 ))
-# This one's public.
-c['status'].append(html.WebStatus(
-    distrib_port=8011, allowForce=False
+
+c['status'].append(TinderboxMailNotifier(
+    fromaddr="mozilla2.buildbot@build.mozilla.org",
+    tree="Mozilla2",
+    extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
+    relayhost="mail.build.mozilla.org",
+    logCompression="bzip2"
 ))
 
 
 ####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the
 # waterfall HTML page. The 'projectURL' string will be used to provide a link