Merge from default. production
authorRail Aliiev <rail@mozilla.com>
Fri, 27 Apr 2012 14:02:16 -0400
branchproduction
changeset 5878 17e8047ba73e1d491969ef52fb8f7ef7a2843807
parent 5875 c4dfd6ea090bc2f32d099a85885d9b8d04831382 (current diff)
parent 5877 20e30b57aaeeb86f389539439435ed4f2d3527e1 (diff)
child 5880 29dbcaadf15f88d2c7c48872f4cd2320cd487a12
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
bugs745300, 749494, 749288, 749577, 711534, 749524, 744590, 749623, 739994, 749596
Merge from default. changeset: 5864:58b18a8bf6e8 parent: 5861:183ed6134521 user: Chris Cooper <ccooper@deadsquid.com> date: Thu Apr 26 16:55:37 2012 -0400 summary: Bug 745300 - use lion slaves for spidermonkey - r=jhford changeset: 5865:d77f0ed0ddad user: John Hopkins <jhopkins@mozilla.com> date: Thu Apr 26 23:22:15 2012 -0400 summary: Bug 749494 - Re-enable graph server for staging/preproduction. r=nthomas changeset: 5866:2351f0c32cbf user: Ben Hearsum <bhearsum@mozilla.com> date: Fri Apr 27 09:06:53 2012 -0400 summary: bug 749288: linux comm-central builds use wrong python when calling balrog client. r=rail,jhopkins changeset: 5867:2eba971eac05 user: Rail Aliiev <rail@mozilla.com> date: Fri Apr 27 09:54:24 2012 -0400 summary: Bug 749577 - Enabling checkin tests for alder. r=armenzg changeset: 5868:f335696d8e8b user: John Hopkins <jhopkins@mozilla.com> date: Fri Apr 27 10:19:33 2012 -0400 summary: Bug 711534 - Configure Thunderbird release builders. r=bhearsum changeset: 5869:14f9192d046a user: John Hopkins <jhopkins@mozilla.com> date: Fri Apr 27 10:35:46 2012 -0400 summary: Bug 749524 - Upload comm-aurora snippets to comm-aurora-test channel. r=standard8 changeset: 5870:acad2363c1d0 user: Rail Aliiev <rail@mozilla.com> date: Fri Apr 27 11:01:44 2012 -0400 summary: Backed out 2eba971eac05 changeset: 5871:a44ad99a2b78 tag: FENNEC_13_0b1_BUILD1 user: John Ford <jhford@mozilla.com> date: Fri Apr 27 09:20:38 2012 -0700 summary: bug 744590 - mobile respin for bug 749623 r=bhearsum changeset: 5872:4ad39ffcd501 user: John Ford <jhford@mozilla.com> date: Fri Apr 27 09:21:25 2012 -0700 summary: Added tag FENNEC_13_0b1_RELEASE, FENNEC_13_0b1_BUILD1 for changeset a44ad99a2b78 changeset: 5876:94c066d76661 parent: 5872:4ad39ffcd501 user: Chris Cooper <ccooper@deadsquid.com> date: Fri Apr 27 13:56:16 2012 -0400 summary: Bug 739994 - Remove references to 10.5 platform and associated slaves in configs - r=jhford changeset: 5877:20e30b57aaee tag: tip user: Rail Aliiev <rail@mozilla.com> date: Fri Apr 27 13:59:27 2012 -0400 summary: Bug 749596 - Enable aurora nightly updates (April 27th, 2012 edition). r=catlee
.hgtags
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -33,29 +33,29 @@ ACTIVE_THUNDERBIRD_BRANCHES = [
     'comm-beta',
     'comm-aurora',
     'comm-release',
     'comm-esr10',
 ]
 ACTIVE_PROJECTS = PROJECTS.keys()
 
 ACTIVE_RELEASE_BRANCHES = []
+ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = []
 ACTIVE_MOBILE_RELEASE_BRANCHES = []
 ENABLE_RELEASES = False
 if 'release_branches' in master_config:
     ACTIVE_RELEASE_BRANCHES.extend(master_config['release_branches'])
     ENABLE_RELEASES = True
 if 'mobile_release_branches' in master_config:
     ACTIVE_MOBILE_RELEASE_BRANCHES.extend(master_config['mobile_release_branches'])
     ENABLE_RELEASES = True
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 RESERVED_SLAVES = "reserved_slaves_%(name)s" % master_config
 
 QUEUEDIR = master_config.get("queuedir", "/dev/shm/queue")
 
--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -1,14 +1,17 @@
 # import/reload dance so that reconfigs work
 # buildbotcustom.misc has to be imported/reloaded prior to master_localconfig
 # so that the fastRegexes don't get reset
 # vim: ft=python
 import os, sys
 
+# NOTE: builder_master.cfg and universal_master_sqlite.cfg need to be kept in sync
+#       as much of the logic is duplicated between them.
+
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
 import master_localconfig
 import build.paths
 reload(buildbotcustom.misc)
@@ -38,81 +41,100 @@ c['status'].append(QueuedCommandHandler(
     command=[sys.executable, os.path.join(os.path.dirname(buildbotcustom.__file__), 'bin', 'postrun.py'), '-c', os.path.abspath(os.path.join(os.curdir, 'postrun.cfg'))],
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PROJECTS, SLAVES, \
          ENABLE_RELEASES, RESERVED_SLAVES, ACTIVE_RELEASE_BRANCHES, \
-         ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_BRANCHES
+         ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_BRANCHES, \
+         ACTIVE_THUNDERBIRD_RELEASE_BRANCHES
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 for platform, names in SLAVES.items():
     for name in names:
         c['slaves'].append(BuildSlave(name, SlavePasswords[platform], max_builds=1))
 
 for branch in BRANCHES:
     BRANCHES[branch]['l10n_slaves'] = SLAVES
 
 from buildbotcustom.misc import generateBranchObjects, generateProjectObjects, \
-         mergeBuildObjects, setReservedFileName
+     mergeBuildObjects, setReservedFileName
 
 from buildbot.schedulers.triggerable import Triggerable
 
 buildObjects = {'builders': [], 'status': [], 'schedulers': []}
 
 import passwords
 reload(passwords)
 
 for branch in ACTIVE_BRANCHES:
     branchObjects = generateBranchObjects(BRANCHES[branch], branch,
             getattr(passwords, 'secrets', None))
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     branchObjects = generateBranchObjects(THUNDERBIRD_BRANCHES[branch], branch,
             getattr(passwords, 'secrets', None))
+    # Strip away any duplicate change sources
+    usefulChangeSources = []
+    for cs in branchObjects['change_source']:
+        if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
+            usefulChangeSources.append(cs)
+    branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
+# Remove duplicate change sources
+for cs in buildObjects['change_source'][:]:
+    cnt = 0
+    for x in buildObjects['change_source']:
+        if x.branch == cs.branch:
+            cnt = cnt + 1
+    if cnt > 1:
+        buildObjects['change_source'].remove(cs)
+
 # We only want builders, status objects, and triggerable schedulers
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])
 for s in buildObjects['schedulers']:
     if isinstance(s, Triggerable):
         c['schedulers'].append(s)
 
 if ENABLE_RELEASES:
     import buildbotcustom.process.release
     reload(buildbotcustom.process.release)
     from buildbotcustom.process.release import generateReleaseBranchObjects
     if RESERVED_SLAVES:
         setReservedFileName(RESERVED_SLAVES)
-    for product, sourceRepoKey, releaseBranch in \
-            [('firefox', 'mozilla', b)
+    for product, sourceRepoKey, productBranches, releaseBranch in \
+            [('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
+             for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
+            [('firefox', 'mozilla', BRANCHES, b)
              for b in ACTIVE_RELEASE_BRANCHES] + \
-            [('fennec', 'mobile', b)
+            [('fennec', 'mobile', BRANCHES, b)
              for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
         releaseBranchConfig = {}
         releaseConfigFile = "release-%s-%s.py" % (product, releaseBranch)
         execfile(releaseConfigFile, releaseBranchConfig, releaseBranchConfig)
-        branchConfig = BRANCHES[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
+        branchConfig = productBranches[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
         releaseObjects = generateReleaseBranchObjects(
             releaseBranchConfig['releaseConfig'], branchConfig,
             releaseConfigFile=getRealpath(releaseConfigFile),
             sourceRepoKey=sourceRepoKey,
-            secrets=getattr(passwords, 'secrets', None))
+            secrets=getattr(passwords, 'secrets', None)
+        )
         for key in releaseObjects.keys():
             c[key].extend(releaseObjects[key])
         from buildbot.changes.pb import PBChangeSource
         if len([cs for cs in c['change_source'] if isinstance(cs, PBChangeSource)]) < 1:
             c['change_source'].append(PBChangeSource())
 
 from passwords import BBDB_URL
 c['db_url'] = BBDB_URL
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1,17 +1,17 @@
 from copy import deepcopy
 
 import project_branches
 reload(project_branches)
 from project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
 
 import localconfig
 reload(localconfig)
-from localconfig import MAC_SNOW_MINIS, MAC_MINIS, XSERVES, LINUX_VMS, \
+from localconfig import MAC_LION_MINIS, MAC_SNOW_MINIS, LINUX_VMS, \
                         LINUX_IXS, WIN32_IXS, SLAVES, \
                         TRY_SLAVES
 
 GLOBAL_VARS = {
     # It's a little unfortunate to have both of these but some things (HgPoller)
     # require an URL while other things (BuildSteps) require only the host.
     # Since they're both right here it shouldn't be
     # a problem to keep them in sync.
@@ -394,56 +394,16 @@ PLATFORM_VARS = {
                 'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': [],
             'unittest_masters': [],
             'test_pretty_names': False,
         },
-        'macosx': {
-            'product_name': 'firefox',
-            'app_name': 'browser',
-            'brand_name': 'Minefield',
-            'base_name': 'OS X 10.5.2 %(branch)s',
-            'mozconfig': 'macosx/%(branch)s/nightly',
-            'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/nightly',
-            'src_xulrunner_mozconfig': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
-            'src_shark_mozconfig': 'browser/config/mozconfigs/macosx-universal/shark',
-            'profiled_build': False,
-            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
-            'build_space': 10,
-            'upload_symbols': True,
-            'download_symbols': True,
-            'packageTests': True,
-            'slaves': SLAVES['macosx'],
-            'platform_objdir': "%s/ppc" % OBJDIR,
-            'stage_product': 'firefox',
-            'stage_platform': 'macosx',
-            'update_platform': 'Darwin_Universal-gcc3',
-            'enable_shared_checkouts': True,
-            'enable_shark': True,
-            'env': {
-                'MOZ_OBJDIR': OBJDIR,
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
-                'SYMBOL_SERVER_USER': 'ffxbld',
-                'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-                'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-                'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_dsa",
-                'TINDERBOX_OUTPUT': '1',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'CHOWN_ROOT': '~/bin/chown_root',
-                'CHOWN_REVERT': '~/bin/chown_revert',
-                'LC_ALL': 'C',
-            },
-            'enable_opt_unittests': False,
-            'enable_checktests': True,
-            'talos_masters': GLOBAL_VARS['talos_masters'],
-        },
         'macosx64': {
             'product_name': 'firefox',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'OS X 10.6.2 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
             'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/nightly',
             'src_xulrunner_mozconfig': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
@@ -897,83 +857,91 @@ PLATFORM_VARS = {
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'unittest_masters': GLOBAL_VARS['unittest_masters'],
             'stage_platform': "android-debug",
             'stage_product': 'mobile',
             'android_signing': True,
             'post_upload_include_platform': True,
         },
 }
+# Additional fixups for lion
+PLATFORM_VARS["macosx64-lion"] = deepcopy(PLATFORM_VARS["macosx64"])
+PLATFORM_VARS["macosx64-lion-debug"] = deepcopy(PLATFORM_VARS["macosx64-debug"])
+PLATFORM_VARS["macosx64-lion"]["base_name"] = 'OS X 10.7 %(branch)s'
+PLATFORM_VARS["macosx64-lion-debug"]["base_name"] = 'OS X 10.7 64-bit %(branch)s leak test'
+PLATFORM_VARS["macosx64-lion"]["slaves"] = SLAVES['macosx64-lion']
+PLATFORM_VARS["macosx64-lion-debug"]["slaves"] = SLAVES['macosx64-lion']
+PLATFORM_VARS["macosx64-lion"]["enable_shark"] = False
+PLATFORM_VARS["macosx64-lion-debug"]["enable_shark"] = False
 
 PROJECTS = {
     'fuzzing': {
-        'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32'],
+        'platforms': ['linux', 'linux64', 'macosx64-lion', 'win32'],
     },
     'nanojit': {
-        'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32'],
+        'platforms': ['linux', 'linux64', 'macosx64-lion', 'win32'],
         'hgurl': 'http://hg.mozilla.org',
         'repo_path': 'projects/nanojit-central',
     },
     'spidermonkey_mozilla-inbound': {
         'platforms': {
             'linux':          ['warnaserr'],
             'linux-debug':    ['nomethodjit', 'notracejit', 'warnaserrdebug'],
             'linux64':        ['warnaserr'],
             'linux64-debug':  ['nomethodjit', 'notracejit', 'warnaserrdebug'],
             'win32':          ['warnaserr'],
             'win32-debug':    ['nomethodjit', 'notracejit', 'warnaserrdebug'],
-            'macosx64':       ['warnaserr'],
-            'macosx64-debug': ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
+            'macosx64-lion':           ['warnaserr'],
+            'macosx64-lion-debug':     ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
         },
         'env': {
             'linux': PLATFORM_VARS['linux']['env'],
             'linux-debug': PLATFORM_VARS['linux-debug']['env'],
             'linux64': PLATFORM_VARS['linux64']['env'],
             'linux64-debug': PLATFORM_VARS['linux64-debug']['env'],
             'win32': PLATFORM_VARS['win32']['env'],
             'win32-debug': PLATFORM_VARS['win32-debug']['env'],
-            'macosx64': PLATFORM_VARS['macosx64']['env'],
-            'macosx64-debug': PLATFORM_VARS['macosx64-debug']['env'],
+            'macosx64-lion': PLATFORM_VARS['macosx64-lion']['env'],
+            'macosx64-lion-debug': PLATFORM_VARS['macosx64-lion-debug']['env'],
         },
         'hgurl': 'http://hg.mozilla.org/',
         'repo_path': 'integration/mozilla-inbound',
     },
     'spidermonkey_ionmonkey': {
         'platforms': {
             'linux':          ['warnaserr'],
             'linux-debug':    ['nomethodjit', 'notracejit', 'warnaserrdebug'],
             'linux64':        ['warnaserr'],
             'linux64-debug':  ['nomethodjit', 'notracejit', 'warnaserrdebug'],
             'win32':          ['warnaserr'],
             'win32-debug':    ['nomethodjit', 'notracejit', 'warnaserrdebug'],
-            'macosx64':       ['warnaserr'],
-            'macosx64-debug': ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
+            'macosx64-lion':           ['warnaserr'],
+            'macosx64-lion-debug':     ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
         },
         'env': {
             'linux': PLATFORM_VARS['linux']['env'],
             'linux-debug': PLATFORM_VARS['linux-debug']['env'],
             'linux64': PLATFORM_VARS['linux64']['env'],
             'linux64-debug': PLATFORM_VARS['linux64-debug']['env'],
             'win32': PLATFORM_VARS['win32']['env'],
             'win32-debug': PLATFORM_VARS['win32-debug']['env'],
-            'macosx64': PLATFORM_VARS['macosx64']['env'],
-            'macosx64-debug': PLATFORM_VARS['macosx64-debug']['env'],
+            'macosx64-lion': PLATFORM_VARS['macosx64-lion']['env'],
+            'macosx64-lion-debug': PLATFORM_VARS['macosx64-lion-debug']['env'],
         },
         'hgurl': 'http://hg.mozilla.org/',
         'repo_path': 'projects/ionmonkey',
     },
 }
 
 for k, v in localconfig.PROJECTS.items():
     if k not in PROJECTS:
         PROJECTS[k] = {}
     for k1, v1 in v.items():
         PROJECTS[k][k1] = v1
 
-
 # All branches (not in project_branches) that are to be built MUST be listed here, along with their
 # platforms (if different from the default set).
 BRANCHES = {
     'mozilla-central': {
     },
     'mozilla-release': {
     },
     'mozilla-beta': {
@@ -993,17 +961,17 @@ BRANCHES = {
             'macosx64-debug': {},
             'win32-debug': {},
         },
     },
     'mozilla-1.9.2': {
         'lock_platforms': True,
         'platforms': {
             'linux': {}, 'linux-debug': {}, 'linux64': {}, 'linux64-debug': {},
-            'macosx': {}, 'macosx-debug': {}, 'win32': {}, 'win32-debug': {},
+            'macosx-debug': {}, 'win32': {}, 'win32-debug': {},
         },
     },
     'try': {
     },
 }
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
@@ -1279,18 +1247,18 @@ BRANCHES['mozilla-aurora']['upload_mobil
 # uploaded to. Any platforms with 'debug' in them will not have snippets
 # generated.
 BRANCHES['mozilla-aurora']['create_snippet'] = True
 BRANCHES['mozilla-aurora']['update_channel'] = 'aurora'
 BRANCHES['mozilla-aurora']['create_mobile_snippet'] = True
 BRANCHES['mozilla-aurora']['create_partial'] = True
 BRANCHES['mozilla-aurora']['create_partial_l10n'] = True
 # use mozilla-aurora-test when disabling updates for merges
-BRANCHES['mozilla-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora-test'
-BRANCHES['mozilla-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora-test'
+BRANCHES['mozilla-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora'
+BRANCHES['mozilla-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora'
 BRANCHES['mozilla-aurora']['aus2_mobile_base_upload_dir'] = '/opt/aus2/incoming/2/Fennec/mozilla-aurora-test'
 BRANCHES['mozilla-aurora']['aus2_mobile_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Fennec/mozilla-aurora-test'
 BRANCHES['mozilla-aurora']['enable_blocklist_update'] = True
 BRANCHES['mozilla-aurora']['blocklist_update_on_closed_tree'] = False
 del BRANCHES['mozilla-aurora']['platforms']['win64']
 BRANCHES['mozilla-aurora']['enable_valgrind'] = False
 BRANCHES['mozilla-aurora']['platforms']['android']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'mozilla-aurora'
 BRANCHES['mozilla-aurora']['platforms']['android-xul']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-xul-mozilla-aurora'
@@ -1400,17 +1368,16 @@ BRANCHES['mozilla-1.9.2']['l10n_repo_pat
 BRANCHES['mozilla-1.9.2']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-1.9.2']['brand_name'] = 'Namoroka'
 BRANCHES['mozilla-1.9.2']['start_hour'] = [3]
 BRANCHES['mozilla-1.9.2']['start_minute'] = [32]
 BRANCHES['mozilla-1.9.2']['use_old_updater'] = True
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['build_space'] = 8
 BRANCHES['mozilla-1.9.2']['platforms']['linux64']['build_space'] = 8
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['build_space'] = 8
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['build_space'] = 7
 BRANCHES['mozilla-1.9.2']['platforms']['linux-debug']['build_space'] = 3
 BRANCHES['mozilla-1.9.2']['platforms']['linux64-debug']['build_space'] = 3
 BRANCHES['mozilla-1.9.2']['platforms']['win32-debug']['build_space'] = 4
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['build_space'] = 3
 # We build 10.5 leak builds on 10.5 while newer branches do it on 10.6 machines
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx']
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-1.9.2']['enable_xulrunner'] = True
@@ -1423,30 +1390,28 @@ BRANCHES['mozilla-1.9.2']['unittest_suit
     ('crashtest', ['crashtest']),
     ('xpcshell', ['xpcshell']),
 ]
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['enable_unittests'] = True
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux-debug']['enable_unittests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux-debug']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux64-debug']['enable_checktests'] = False
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['enable_unittests'] = True
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['enable_unittests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['enable_unittests'] = True
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['win32-debug']['enable_unittests'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['win32-debug']['enable_checktests'] = False
 BRANCHES['mozilla-1.9.2']['enable_mac_a11y'] = False
 BRANCHES['mozilla-1.9.2']['unittest_build_space'] = 5
 # L10n configuration
 BRANCHES['mozilla-1.9.2']['enable_l10n'] = True
 BRANCHES['mozilla-1.9.2']['enable_l10n_onchange'] = True
-BRANCHES['mozilla-1.9.2']['l10n_platforms'] = ['linux','win32','macosx']
+BRANCHES['mozilla-1.9.2']['l10n_platforms'] = ['linux','win32',]
 BRANCHES['mozilla-1.9.2']['l10nNightlyUpdate'] = True
 BRANCHES['mozilla-1.9.2']['l10nDatedDirs'] = True
 BRANCHES['mozilla-1.9.2']['l10n_tree'] = 'fx36x'
 BRANCHES['mozilla-1.9.2']['l10n_modules'] =  [
     'browser', 'extensions/reporter',
     'other-licenses/branding/firefox', 'netwerk', 'dom', 'toolkit',
     'security/manager',
     ]
@@ -1463,25 +1428,22 @@ BRANCHES['mozilla-1.9.2']['update_channe
 BRANCHES['mozilla-1.9.2']['create_partial'] = True
 BRANCHES['mozilla-1.9.2']['create_partial_l10n'] = True
 BRANCHES['mozilla-1.9.2']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.2'
 BRANCHES['mozilla-1.9.2']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.2'
 BRANCHES['mozilla-1.9.2']['enable_blocklist_update'] = True
 BRANCHES['mozilla-1.9.2']['blocklist_update_on_closed_tree'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['l10n_check_test'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux64']['l10n_check_test'] = False
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['l10n_check_test'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['l10n_check_test'] = False
 BRANCHES['mozilla-1.9.2']['enable_valgrind'] = False
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux']['dep_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux64']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux64']['dep_signing_servers'] = None
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['nightly_signing_servers'] = None
-BRANCHES['mozilla-1.9.2']['platforms']['macosx']['dep_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['win32']['dep_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux-debug']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux-debug']['dep_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux64-debug']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['linux64-debug']['dep_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['nightly_signing_servers'] = None
 BRANCHES['mozilla-1.9.2']['platforms']['macosx-debug']['dep_signing_servers'] = None
@@ -1696,19 +1658,18 @@ for b in BRANCHES.keys():
                 BRANCHES[b]['platforms'][p]['slaves'] = slave_list
                 BRANCHES[b]['platforms'][p]['l10n_slaves_key'] = 'macosx64-lion'
                 BRANCHES[b]['platforms'][p]['base_name'] = lion_names[p] % {'branch': b}
                 BRANCHES[b]['platforms'][p]['enable_ccache'] = True
                 BRANCHES[b]['platforms'][p]['env']['CCACHE_DIR'] = '/builds/ccache'
                 BRANCHES[b]['platforms'][p]['env']['CCACHE_COMPRESS'] = '1'
                 BRANCHES[b]['platforms'][p]['env']['CCACHE_UMASK'] = '002'
                 BRANCHES[b]['platforms'][p]['enable_shark'] = False
-
-
-
+                
+        
 if __name__ == "__main__":
     import sys, pprint
     args = sys.argv[1:]
 
     if len(args) > 0:
         branches = args
     else:
         branches = BRANCHES.keys()
--- a/mozilla/preproduction_builder_master_localconfig.py
+++ b/mozilla/preproduction_builder_master_localconfig.py
@@ -20,14 +20,13 @@ ACTIVE_RELEASE_BRANCHES = []
 ACTIVE_MOBILE_RELEASE_BRANCHES = []
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = False
 RESERVED_SLAVES = None
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/preproduction_config.py
+++ b/mozilla/preproduction_config.py
@@ -1,47 +1,43 @@
 MAC_LION_MINIS = ['r5-mini-%03d' % x for x in range(1,7)] + \
                  ['bld-lion-r5-%03d' % x for x in range(1,81)]
 MAC_SNOW_MINIS = ['moz2-darwin10-slave%02i' % x for x in range(2,30) + range(40,57)]
-MAC_MINIS      = ['moz2-darwin9-slave%02i' % x for x in range(1,73) if x not in (4,5,20,40,59)]
-XSERVES        = ['bm-xserve%02i' % x for x in range(6,13) + range(15,25)]
 WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(1,27)] + ['w32-ix-slave%02i' % x for x in range(1,45)]
 WIN64_IXS      = ['mw64-ix-slave01'] + ['w64-ix-slave%02i' % x for x in range(1,43)]
 LINUX_VMS      = ['moz2-linux-slave%02i' % x for x in range(1,61)]
 LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(1,24)] + ['linux-ix-slave%02i' % x for x in range(1,43)]
 LINUX64_VMS    = ['moz2-linux64-slave%02i' % x for x in range(1,13)]
 LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(1,42)]
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(1,43)]
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
+    'macosx':           [],
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'linux-android':    LINUX_VMS + LINUX_IXS,
     'android':          LINUX_VMS + LINUX_IXS,
     'android-xul':      LINUX_VMS + LINUX_IXS,
     'mock':             MOCK_DL120G7
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,31)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
-TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
 TRY_WIN32_IXS  = []
 
 TRY_SLAVES = SLAVES
 TRY_SLAVES['linux'] += TRY_LINUX + TRY_LINUX_IXS
 TRY_SLAVES['linux64'] += TRY_LINUX64 + TRY_LINUX64_IXS
-TRY_SLAVES['macosx'] += TRY_MAC
 TRY_SLAVES['macosx64'] += TRY_MAC64
 TRY_SLAVES['win32'] += TRY_WIN32_IXS
 
 
 GLOBAL_VARS = {
     'staging': True,
     'config_repo_path': 'build/buildbot-configs',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
--- a/mozilla/preproduction_release_master_localconfig.py
+++ b/mozilla/preproduction_release_master_localconfig.py
@@ -20,14 +20,13 @@ ACTIVE_MOBILE_RELEASE_BRANCHES = ['mozil
                                   'mozilla-esr10']
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = True
 RESERVED_SLAVES = None
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -1,14 +1,11 @@
 MAC_LION_MINIS = ['bld-lion-r5-%03d' % x for x in range(41,81)]
 MAC_SNOW_MINIS = ['moz2-darwin10-slave%02i' % x for x in range(5,10) + \
                  range(15,30) + range(40,57) if x not in (52,)] # bug683792
-MAC_MINIS      = ['moz2-darwin9-slave%02i' % x for x in range(1,27) + range(38,55) \
-                 if x not in (3,4,5,8,10,20,40)] # bug629763
-XSERVES        = ['bm-xserve%02i' % x for x in [7,9,11,12,15,16,17,18,19,22]] # bug700705
 LINUX_VMS      = ['moz2-linux-slave%02i' % x for x in [1,2] + range(5,47) \
                  if x not in (10,17)]
 LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(2,22)] + \
                  ['linux-ix-slave%02i' % x for x in [1,2,6] + range(12,43)]
 LINUX64_VMS    = ['moz2-linux64-slave%02i' % x for x in range(1,13) \
                  if x not in (7,10)]
 LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(3,22)]
 WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(2,16) + [20, 26]] + \
@@ -16,48 +13,44 @@ WIN32_IXS      = ['mw32-ix-slave%02i' % 
 WIN64_IXS      = ['w64-ix-slave%02i' % x for x in [2] + range(6,25)]
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(6,24)] # 5 staging, 17 prod, 17 try
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
+    'macosx':           []
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'linux-android':    LINUX_VMS + LINUX_IXS,
     'android':          LINUX_VMS + LINUX_IXS,
     'android-xul':      LINUX_VMS + LINUX_IXS,
     'mock':             MOCK_DL120G7
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range(1,5) + range(6,31)] + \
                  ['moz2-linux-slave%02i' % x for x in range(47,51)]
 TRY_LINUX_IXS  = ['mv-moz2-linux-ix-slave%02i' % x for x in range(22,24)] + \
                  ['linux-ix-slave%02i' % x for x in range(7,12)]
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range(1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,42)]
-TRY_MAC        = ['try-mac-slave%02i' % x for x in range(1,5) + range(6,48) \
-                 if x not in (11,16,35,) and x not in range(20,30)] # Bug 650297 & bug 700705
-TRY_XSERVES    = ['bm-xserve%02i' % x for x in [8,10,20,23,24]]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range(1,32)] + \
                  ['moz2-darwin10-slave%02i' % x for x in range(11,15)]
 TRY_WIN32_IXS  = ['mw32-ix-slave%02i' % x for x in range(16,19) + range(22,26)] + \
                  ['w32-ix-slave%02i' % x for x in range(2,24)]
 TRY_WIN64_IXS  = ['w64-ix-slave%02i' % x for x in range(25,43)]
 TRY_MOCK_DL120G7 = ['bld-centos6-hp-%03d' % x for x in range(24,43)]
 TRY_LION         = ['bld-lion-r5-%03d' % x for x in range(1,41)]
 
 TRY_SLAVES = {
     'linux':       TRY_LINUX + TRY_LINUX_IXS,
     'linux64':     TRY_LINUX64 + TRY_LINUX64_IXS,
     'win32':       TRY_WIN32_IXS,
     'win64':       TRY_WIN64_IXS,
-    'macosx':      TRY_MAC + TRY_XSERVES,
     'macosx64':    TRY_MAC64,
     'macosx64-lion': TRY_LION,
     'mock':        TRY_MOCK_DL120G7,
 }
 
 # Local overrides for default values
 GLOBAL_VARS = {
     'config_repo_path': 'build/buildbot-configs',
@@ -173,21 +166,17 @@ BRANCHES = {
                     'BINSCOPE': 'C:\Program Files\Microsoft\SDL BinScope\Binscope.exe',
                     'PATH': "${MOZILLABUILD}buildbotve\\scripts;${PATH}",
                 }
             }
         }
     },
 }
 
-PLATFORM_VARS = {
-    'macosx': {
-        'talos_masters': GLOBAL_VARS['talos_masters'] + [('talos-master.mozilla.org:9010', True, 5)]
-    }
-}
+PLATFORM_VARS = {}
 
 PROJECTS = {
     'fuzzing': {
         'scripts_repo': 'http://hg.mozilla.org/build/tools',
         'fuzzing_repo': 'ssh://ffxbld@hg.mozilla.org/private/fuzzing',
         'fuzzing_remote_host': 'ffxbld@pvtbuilds2.dmz.scl3.mozilla.com',
         # Path needs extra leading slash due to optparse expansion on Win32
         'fuzzing_base_dir': '//mnt/pvt_builds/fuzzing/',
--- a/mozilla/release-thunderbird-comm-beta.py
+++ b/mozilla/release-thunderbird-comm-beta.py
@@ -25,33 +25,53 @@ releaseConfig['oldVersion']          = '
 releaseConfig['oldAppVersion']       = '12.0'
 releaseConfig['oldBuildNumber']      = 1
 releaseConfig['oldBaseTag']          = 'THUNDERBIRD_12_0b3'
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
-    'mozilla': {
+    'comm': {
         'name': 'comm-beta',
         'path': 'releases/comm-beta',
         'revision': 'fa4685b8588e',
         'relbranch': None,
         'bumpFiles': {
             'mail/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
+    },
+    'mozilla': {
+        'name': 'mozilla-beta',
+        'path': 'releases/mozilla-beta',
+        'revision': '3182caa7f19a',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-beta'
-releaseConfig['l10nRevisionFile']    = 'l10n-thunderbird-changesets-beta'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-beta'
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/mozharness': 'default',
 }
 
 # Platform configuration
@@ -95,17 +115,16 @@ releaseConfig['verifyConfigs']       = {
     'win32':  'mozBeta-thunderbird-win32.cfg'
 }
 releaseConfig['mozconfigs']          = {
     'linux': 'mail/config/mozconfigs/linux32/release',
     'linux64': 'mail/config/mozconfigs/linux64/release',
     'macosx64': 'mail/config/mozconfigs/macosx-universal/release',
     'win32': 'mail/config/mozconfigs/win32/release',
 }
-releaseConfig['xulrunner_mozconfigs']          = {}
 releaseConfig['releaseChannel']      = 'beta'
 
 # Partner repack configuration
 releaseConfig['doPartnerRepacks']    = False
 releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
 
 # Major update configuration
 releaseConfig['majorUpdateRepoPath'] = None
--- a/mozilla/release-thunderbird-comm-esr10.py
+++ b/mozilla/release-thunderbird-comm-esr10.py
@@ -25,33 +25,53 @@ releaseConfig['oldVersion']          = '
 releaseConfig['oldAppVersion']       = '10.0.2'
 releaseConfig['oldBuildNumber']      = 1
 releaseConfig['oldBaseTag']          = 'THUNDERBIRD_10_0_2esr'
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = '10.0.4esrpre'
 releaseConfig['nextMilestone']       = '10.0.4esrpre'
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
-    'mozilla': {
+    'comm': {
         'name': 'comm-esr10',
         'path': 'releases/comm-esr10',
         'revision': 'f0e5d995d302',
         'relbranch': None,
         'bumpFiles': {
             'mail/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
+    },
+    'mozilla': {
+        'name': 'mozilla-esr10',
+        'path': 'releases/mozilla-esr10',
+        'revision': '26d65ee6bcde',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile']    = 'l10n-thunderbird-changesets-esr10'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr10'
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_0_8_2',
     'build/buildbot': 'production-0.8',
     'build/partner-repacks': 'default',
     'build/mozharness': 'default',
 }
 
--- a/mozilla/release-thunderbird-comm-release.py
+++ b/mozilla/release-thunderbird-comm-release.py
@@ -25,33 +25,53 @@ releaseConfig['oldVersion']          = '
 releaseConfig['oldAppVersion']       = releaseConfig['oldVersion']
 releaseConfig['oldBuildNumber']      = 1
 releaseConfig['oldBaseTag']          = 'THUNDERBIRD_10_0_2'
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
-    'mozilla': {
+    'comm': {
         'name': 'comm-release',
         'path': 'releases/comm-release',
         'revision': '832c448e5d0a',
         'relbranch': None,
         'bumpFiles': {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
+    },
+    'mozilla': {
+        'name': 'mozilla-release',
+        'path': 'releases/mozilla-release',
+        'revision': '5bcfa0da3be9',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile']    = 'l10n-thunderbird-changesets-release'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-release'
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/partner-repacks': 'default',
     'build/mozharness': 'default',
 }
 
@@ -96,17 +116,16 @@ releaseConfig['verifyConfigs']       = {
     'win32':  'mozRelease-thunderbird-win32.cfg'
 }
 releaseConfig['mozconfigs']          = {
     'linux': 'mail/config/mozconfigs/linux32/release',
     'linux64': 'mail/config/mozconfigs/linux64/release',
     'macosx64': 'mail/config/mozconfigs/macosx-universal/release',
     'win32': 'mail/config/mozconfigs/win32/release',
 }
-releaseConfig['xulrunner_mozconfigs']          = {}
 
 # Partner repack configuration
 releaseConfig['doPartnerRepacks']    = True
 releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
 
 # Major update configuration
 releaseConfig['majorUpdateRepoPath'] = None
 # Tuxedo/Bouncer configuration
--- a/mozilla/staging_builder_master_sm01_localconfig.py
+++ b/mozilla/staging_builder_master_sm01_localconfig.py
@@ -19,14 +19,13 @@ ACTIVE_MOBILE_RELEASE_BRANCHES = ['mozil
 
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = True
 RESERVED_SLAVES = "reserved_slaves_sm01"
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/staging_builder_master_sm02_localconfig.py
+++ b/mozilla/staging_builder_master_sm02_localconfig.py
@@ -11,24 +11,24 @@ c['buildbotURL'] = 'http://dev-master01.
 from buildbot import manhole
 c['manhole'] = manhole.PasswordManhole("tcp:1236:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, SLAVES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_PROJECTS = PROJECTS.keys()
 ACTIVE_RELEASE_BRANCHES = ['mozilla-beta', 'mozilla-release']
+ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = ['comm-beta', 'comm-release']
 ACTIVE_MOBILE_RELEASE_BRANCHES = ['mozilla-beta', 'mozilla-release']
 ACTIVE_THUNDERBIRD_BRANCHES = THUNDERBIRD_BRANCHES.keys()
 
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = True
 RESERVED_SLAVES = "reserved_slaves_sm02"
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/staging_builder_master_sm03_localconfig.py
+++ b/mozilla/staging_builder_master_sm03_localconfig.py
@@ -18,14 +18,13 @@ ACTIVE_RELEASE_BRANCHES = ['mozilla-beta
 ACTIVE_MOBILE_RELEASE_BRANCHES = ['mozilla-beta', 'mozilla-release']
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = True
 RESERVED_SLAVES = "reserved_slaves_sm03"
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -1,48 +1,44 @@
 MAC_LION_MINIS = ['r5-mini-%03d' % x for x in range(1,7)] + \
                  ['bld-lion-r5-%03d' % x for x in range(1,81)]
 MAC_SNOW_MINIS = ['moz2-darwin10-slave%02i' % x for x in range(2,30) + range(40,57)]
-MAC_MINIS      = ['moz2-darwin9-slave%02i' % x for x in range(1,73) if x not in (4,5,20,40,59)]
-XSERVES        = ['bm-xserve%02i' % x for x in range(6,13) + range(15,25)]
 WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(1,27)] + ['w32-ix-slave%02i' % x for x in range(1,45)]
 WIN64_IXS      = ['mw64-ix-slave01'] + ['w64-ix-slave%02i' % x for x in range(1,43)]
 LINUX_VMS      = ['moz2-linux-slave%02i' % x for x in range(1,61)]
 LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(1,24)] + ['linux-ix-slave%02i' % x for x in range(1,43)]
 LINUX64_VMS    = ['moz2-linux64-slave%02i' % x for x in range(1,13)]
 LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(1,42)]
 
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(1,43)]
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
+    'macosx':           [],
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'linux-android':    LINUX_VMS + LINUX_IXS,
     'android':          LINUX_VMS + LINUX_IXS,
     'android-xul':      LINUX_VMS + LINUX_IXS,
     'mock':             MOCK_DL120G7
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,31)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
-TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
 TRY_WIN32_IXS  = []
 
 TRY_SLAVES = SLAVES
 TRY_SLAVES['linux'] += TRY_LINUX + TRY_LINUX_IXS
 TRY_SLAVES['linux64'] += TRY_LINUX64 + TRY_LINUX64_IXS
-TRY_SLAVES['macosx'] += TRY_MAC
 TRY_SLAVES['macosx64'] += TRY_MAC64
 TRY_SLAVES['win32'] += TRY_WIN32_IXS
 
 
 GLOBAL_VARS = {
     'staging': True,
     'config_repo_path': 'build/buildbot-configs',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
new file mode 100644
--- /dev/null
+++ b/mozilla/staging_release-thunderbird-comm-beta.py
@@ -0,0 +1,151 @@
+releaseConfig = {}
+releaseConfig['skip_repo_setup']       = True
+releaseConfig['disable_tinderbox_mail'] = True
+
+# Release Notification
+releaseConfig['AllRecipients']       = ['release@mozilla.com',]
+releaseConfig['ImportantRecipients'] = ['release@mozilla.com',]
+releaseConfig['AVVendorsRecipients'] = ['release@mozilla.com',]
+releaseConfig['releaseTemplates']    = 'release_templates'
+releaseConfig['messagePrefix']       = '[staging-release] '
+
+# Basic product configuration
+#  Names for the product/files
+releaseConfig['productName']         = 'thunderbird'
+releaseConfig['appName']             = 'mail'
+releaseConfig['binaryName']          = releaseConfig['productName'].capitalize()
+releaseConfig['oldBinaryName']       = releaseConfig['binaryName']
+#  Current version info
+releaseConfig['version']             = '12.0b5'
+releaseConfig['appVersion']          = '12.0'
+releaseConfig['milestone']           = '12.0'
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'THUNDERBIRD_12_0b5'
+#  Old version info
+releaseConfig['oldVersion']          = '12.0b4'
+releaseConfig['oldAppVersion']       = '12.0'
+releaseConfig['oldBuildNumber']      = 1
+releaseConfig['oldBaseTag']          = 'THUNDERBIRD_12_0b4'
+#  Next (nightly) version info
+releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
+releaseConfig['nextMilestone']       = releaseConfig['milestone']
+#  Repository configuration, for tagging
+## Staging repository path
+releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
+releaseConfig['sourceRepositories']  = {
+    'comm': {
+        'name': 'comm-beta',
+        'clonePath': 'releases/comm-beta',
+        'path': 'users/stage-ffxbld/comm-beta',
+        'revision': 'THUNDERBIRD_12_0b5_RELEASE',
+        'relbranch': None,
+        'bumpFiles': {
+            'mail/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+        }
+    },
+    'mozilla': {
+        'name': 'mozilla-beta',
+        'clonePath': 'releases/mozilla-beta',
+        'path': 'users/stage-ffxbld/mozilla-beta',
+        'revision': 'THUNDERBIRD_12_0b5_RELEASE',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
+    }
+}
+#  L10n repositories
+releaseConfig['l10nRelbranch']       = None
+releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-beta'
+releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-beta'
+#  Support repositories
+releaseConfig['otherReposToTag']     = {
+    'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+    'users/stage-ffxbld/buildbot': 'production-0.8',
+    'users/stage-ffxbld/mozharness': 'default',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
+releaseConfig['talosTestPlatforms']  = ()
+releaseConfig['xulrunnerPlatforms']  = ()
+
+# Unittests
+releaseConfig['unittestPlatforms']   = ()
+releaseConfig['enableUnittests']     = True
+
+# L10n configuration
+releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
+releaseConfig['l10nChunks']          = 2
+releaseConfig['mergeLocales']        = True
+
+# Mercurial account
+releaseConfig['hgUsername']          = 'stage-ffxbld'
+releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
+
+# Update-specific configuration
+releaseConfig['cvsroot']             = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
+releaseConfig['patcherConfig']       = 'mozBeta-thunderbird-branch-patcher2.cfg'
+releaseConfig['commitPatcherConfig'] = False
+releaseConfig['patcherToolsTag']     = 'UPDATE_PACKAGING_R16'
+releaseConfig['ftpServer']           = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['stagingServer']       = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['ausServerUrl']        = 'http://dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausHost']             = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausUser']             = 'cltbld'
+releaseConfig['ausSshKey']           = 'cltbld_dsa'
+releaseConfig['releaseNotesUrl']     = None
+releaseConfig['testOlderPartials']   = False
+releaseConfig['verifyConfigs']       = {
+    'linux':  'mozBeta-thunderbird-linux.cfg',
+    'linux64':  'mozBeta-thunderbird-linux64.cfg',
+    'macosx64': 'mozBeta-thunderbird-mac64.cfg',
+    'win32':  'mozBeta-thunderbird-win32.cfg'
+}
+releaseConfig['mozconfigs']          = {
+    'linux': 'mail/config/mozconfigs/linux32/release',
+    'linux64': 'mail/config/mozconfigs/linux64/release',
+    'macosx64': 'mail/config/mozconfigs/macosx-universal/release',
+    'win32': 'mail/config/mozconfigs/win32/release',
+}
+releaseConfig['releaseChannel']      = 'beta'
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks']    = False
+releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
+
+# Major update configuration
+releaseConfig['majorUpdateRepoPath'] = None
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoConfig']        = 'thunderbird-tuxedo.ini'
+releaseConfig['tuxedoServerUrl']     = 'https://tuxedo.stage.mozilla.com/api/'
+releaseConfig['extraBouncerPlatforms'] = ('solaris-sparc', 'solaris-i386',
+                                          'opensolaris-sparc',
+                                          'opensolaris-i386')
+releaseConfig['releaseUptake']       = 3
+releaseConfig['releasetestUptake']   = 1
+
+# Misc configuration
+releaseConfig['enable_repo_setup'] = False
+releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
+releaseConfig['enableAutomaticPushToMirrors'] = True
+releaseConfig['enableSigningAtBuildTime'] = True
+releaseConfig['enablePartialMarsAtBuildTime'] = True
new file mode 100644
--- /dev/null
+++ b/mozilla/staging_release-thunderbird-comm-esr10.py
@@ -0,0 +1,148 @@
+releaseConfig = {}
+releaseConfig['skip_repo_setup']        = True
+releaseConfig['disable_tinderbox_mail'] = True
+
+# Release Notification
+releaseConfig['AllRecipients']       = ['release@mozilla.com',]
+releaseConfig['ImportantRecipients'] = ['release@mozilla.com',]
+releaseConfig['AVVendorsRecipients'] = ['release@mozilla.com',]
+releaseConfig['releaseTemplates']    = 'release_templates'
+releaseConfig['messagePrefix']       = '[staging-release] '
+
+# Basic product configuration
+#  Names for the product/files
+releaseConfig['productName']         = 'thunderbird'
+releaseConfig['appName']             = 'mail'
+releaseConfig['binaryName']          = releaseConfig['productName'].capitalize()
+releaseConfig['oldBinaryName']       = releaseConfig['binaryName']
+#  Current version info
+releaseConfig['version']             = '10.0.1esr'
+releaseConfig['appVersion']          = '10.0.1'
+releaseConfig['milestone']           = '10.0.1'
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'THUNDERBIRD_10_0_1esr'
+#  Old version info
+releaseConfig['oldVersion']          = '10.0esr'
+releaseConfig['oldAppVersion']       = releaseConfig['oldVersion']
+releaseConfig['oldBuildNumber']      = 1
+releaseConfig['oldBaseTag']          = 'THUNDERBIRD_10_0esr'
+#  Next (nightly) version info
+releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
+releaseConfig['nextMilestone']       = releaseConfig['milestone']
+#  Repository configuration, for tagging
+## Staging repository path
+releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
+releaseConfig['sourceRepositories']  = {
+    'comm': {
+        'name': 'comm-esr10',
+        'clonePath': 'releases/comm-esr10',
+        'path': 'users/stage-ffxbld/comm-esr10',
+        'revision': 'default',
+        'relbranch': None,
+        'bumpFiles': {
+            'mail/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+        }
+    },
+    'mozilla': {
+        'name': 'mozilla-esr10',
+        'clonePath': 'releases/mozilla-esr10',
+        'path': 'users/stage-ffxbld/mozilla-esr10',
+        'revision': 'default',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
+    }
+}
+#  L10n repositories
+releaseConfig['l10nRelbranch']       = None
+releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-release'
+releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr10'
+#  Support repositories
+releaseConfig['otherReposToTag']     = {
+    'users/stage-ffxbld/compare-locales': 'RELEASE_0_8_2',
+    'users/stage-ffxbld/buildbot': 'production-0.8',
+    'users/stage-ffxbld/partner-repacks': 'default',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms']     = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['talosTestPlatforms']  = ()
+releaseConfig['xulrunnerPlatforms']  = ()
+
+# Unittests
+releaseConfig['unittestPlatforms']   = ()
+releaseConfig['enableUnittests'] = True
+
+# L10n configuration
+releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
+releaseConfig['l10nChunks']          = 2
+releaseConfig['mergeLocales']        = True
+
+# Mercurial account
+releaseConfig['hgUsername']          = 'stage-ffxbld'
+releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
+
+# Update-specific configuration
+releaseConfig['cvsroot']             = ':ext:cltbld@cvs.mozilla.org:/cvsroot'
+releaseConfig['patcherConfig']       = 'mozEsr10-thunderbird-branch-patcher2.cfg'
+releaseConfig['commitPatcherConfig'] = False
+releaseConfig['patcherToolsTag']     = 'UPDATE_PACKAGING_R15'
+releaseConfig['ftpServer']           = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['stagingServer']       = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['ausServerUrl']        = 'http://dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausHost']             = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausUser']             = 'cltbld'
+releaseConfig['ausSshKey']           = 'cltbld_dsa'
+releaseConfig['releaseNotesUrl']     = None
+releaseConfig['testOlderPartials']   = False
+releaseConfig['verifyConfigs']       = {
+    'linux':  'mozEsr10-thunderbird-linux.cfg',
+    'linux64':  'mozEsr10-thunderbird-linux64.cfg',
+    'macosx64': 'mozEsr10-thunderbird-mac64.cfg',
+    'win32':  'mozEsr10-thunderbird-win32.cfg'
+}
+releaseConfig['mozconfigs']          = {
+    'linux': 'mail/config/mozconfigs/linux32/release',
+    'linux64': 'mail/config/mozconfigs/linux64/release',
+    'macosx64': 'mail/config/mozconfigs/macosx-universal/release',
+    'win32': 'mail/config/mozconfigs/win32/release',
+}
+releaseConfig['releaseChannel']      = 'esr'
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks']    = False
+releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
+
+# Major update configuration
+releaseConfig['majorUpdateRepoPath'] = None
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoConfig']        = 'thunderbird-tuxedo.ini'
+releaseConfig['tuxedoServerUrl']     = 'https://tuxedo.stage.mozilla.com/api/'
+releaseConfig['extraBouncerPlatforms'] = ('solaris-sparc', 'solaris-i386',
+                                          'opensolaris-sparc',
+                                          'opensolaris-i386')
+
+# Misc configuration
+releaseConfig['enable_repo_setup'] = False
+releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
+releaseConfig['enableSigningAtBuildTime'] = False
+releaseConfig['enablePartialMarsAtBuildTime'] = False
new file mode 100644
--- /dev/null
+++ b/mozilla/staging_release-thunderbird-comm-release.py
@@ -0,0 +1,148 @@
+releaseConfig = {}
+releaseConfig['skip_repo_setup']        = True
+releaseConfig['disable_tinderbox_mail'] = True
+
+# Release Notification
+releaseConfig['AllRecipients']       = ['release@mozilla.com',]
+releaseConfig['ImportantRecipients'] = ['release@mozilla.com',]
+releaseConfig['AVVendorsRecipients'] = ['release@mozilla.com',]
+releaseConfig['releaseTemplates']    = 'release_templates'
+releaseConfig['messagePrefix']       = '[staging-release] '
+
+# Basic product configuration
+#  Names for the product/files
+releaseConfig['productName']         = 'thunderbird'
+releaseConfig['appName']             = 'mail'
+releaseConfig['binaryName']          = releaseConfig['productName'].capitalize()
+releaseConfig['oldBinaryName']       = releaseConfig['binaryName']
+#  Current version info
+releaseConfig['version']             = '9.0'
+releaseConfig['appVersion']          = releaseConfig['version']
+releaseConfig['milestone']           = releaseConfig['version']
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'THUNDERBIRD_9_0'
+#  Old version info
+releaseConfig['oldVersion']          = '8.0.1'
+releaseConfig['oldAppVersion']       = releaseConfig['oldVersion']
+releaseConfig['oldBuildNumber']      = 2
+releaseConfig['oldBaseTag']          = 'THUNDERBIRD_8_0_1'
+#  Next (nightly) version info
+releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
+releaseConfig['nextMilestone']       = releaseConfig['milestone']
+#  Repository configuration, for tagging
+## Staging repository path
+releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
+releaseConfig['sourceRepositories']  = {
+    'comm': {
+        'name': 'comm-release',
+        'clonePath': 'releases/comm-release',
+        'path': 'users/stage-ffxbld/comm-release',
+        'revision': 'default',
+        'relbranch': None,
+        'bumpFiles': {
+            'mail/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+        }
+    },
+    'mozilla': {
+        'name': 'mozilla-release',
+        'clonePath': 'releases/mozilla-release',
+        'path': 'users/stage-ffxbld/mozilla-release',
+        'revision': 'default',
+        'relbranch': None,
+        'bumpFiles': {
+            'browser/config/version.txt': {
+                'version': releaseConfig['appVersion'],
+                'nextVersion': releaseConfig['nextAppVersion']
+            },
+            'config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+            'js/src/config/milestone.txt': {
+                'version': releaseConfig['milestone'],
+                'nextVersion': releaseConfig['nextMilestone']
+            },
+        }
+    }
+}
+#  L10n repositories
+releaseConfig['l10nRelbranch']       = None
+releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-release'
+releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-release'
+#  Support repositories
+releaseConfig['otherReposToTag']     = {
+    'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+    'users/stage-ffxbld/buildbot': 'production-0.8',
+    'users/stage-ffxbld/partner-repacks': 'default',
+    'users/stage-ffxbld/mozharness': 'default',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms']     = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['talosTestPlatforms']  = ()
+releaseConfig['xulrunnerPlatforms']  = ()
+
+# Unittests
+releaseConfig['unittestPlatforms']   = ()
+releaseConfig['enableUnittests'] = True
+
+# L10n configuration
+releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
+releaseConfig['l10nChunks']          = 2
+releaseConfig['mergeLocales']        = True
+
+# Mercurial account
+releaseConfig['hgUsername']          = 'stage-ffxbld'
+releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
+
+# Update-specific configuration
+releaseConfig['cvsroot']             = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
+releaseConfig['patcherConfig']       = 'mozRelease-thunderbird-branch-patcher2.cfg'
+releaseConfig['commitPatcherConfig'] = False
+releaseConfig['patcherToolsTag']     = 'UPDATE_PACKAGING_R15'
+releaseConfig['ftpServer']           = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['stagingServer']       = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['ausServerUrl']        = 'http://dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausHost']             = 'dev-stage01.build.sjc1.mozilla.com'
+releaseConfig['ausUser']             = 'cltbld'
+releaseConfig['ausSshKey']           = 'cltbld_dsa'
+releaseConfig['releaseNotesUrl']     = None
+releaseConfig['testOlderPartials']   = False
+releaseConfig['verifyConfigs']       = {
+    'linux':  'mozRelease-thunderbird-linux.cfg',
+    'linux64':  'mozRelease-thunderbird-linux64.cfg',
+    'macosx64': 'mozRelease-thunderbird-mac64.cfg',
+    'win32':  'mozRelease-thunderbird-win32.cfg'
+}
+releaseConfig['mozconfigs']          = {
+    'linux': 'mail/config/mozconfigs/linux32/release',
+    'linux64': 'mail/config/mozconfigs/linux64/release',
+    'macosx64': 'mail/config/mozconfigs/macosx-universal/release',
+    'win32': 'mail/config/mozconfigs/win32/release',
+}
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks']    = True
+releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
+
+# Major update configuration
+releaseConfig['majorUpdateRepoPath'] = None
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoConfig']        = 'thunderbird-tuxedo.ini'
+releaseConfig['tuxedoServerUrl']     = 'https://tuxedo.stage.mozilla.com/api/'
+releaseConfig['extraBouncerPlatforms'] = ('solaris-sparc', 'solaris-i386',
+                                          'opensolaris-sparc',
+                                          'opensolaris-i386')
+
+# Misc configuration
+releaseConfig['enable_repo_setup'] = False
+releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
+releaseConfig['enableSigningAtBuildTime'] = False
+releaseConfig['enablePartialMarsAtBuildTime'] = False
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -2,17 +2,17 @@ from copy import deepcopy
 
 from config import GLOBAL_VARS, PLATFORM_VARS
 
 # Note that thunderbird_localconfig.py is symlinked to one of: {production,staging,preproduction}_thunderbird_config.py
 import thunderbird_localconfig
 reload(thunderbird_localconfig)
 
 # Can't reload this one because it gets reloaded in another file
-from localconfig import MAC_SNOW_MINIS, MAC_MINIS, XSERVES, LINUX_VMS, \
+from localconfig import MAC_SNOW_MINIS, LINUX_VMS, \
                         LINUX_IXS, WIN32_IXS, SLAVES, \
                         TRY_SLAVES
 
 GLOBAL_VARS = deepcopy(GLOBAL_VARS)
 PLATFORM_VARS = deepcopy(PLATFORM_VARS)
 
 GLOBAL_VARS['objdir'] = 'obj-tb'
 GLOBAL_VARS['stage_username'] = 'tbirdbld'
@@ -50,17 +50,16 @@ GLOBAL_VARS.update({
     'platforms': {
         'linux': {},
         'linux64': {},
         'win32': {},
         'win64': {},
         'macosx64': {},
         'linux-debug': {},
         'linux64-debug': {},
-        'macosx-debug': {},
         'macosx64-debug': {},
         'win32-debug': {},
     },
     'enable_pgo': False,
     'pgo_platforms': ('linux', 'linux64', 'win32'),
     'pgo_strategy': None,
     'periodic_pgo_interval': 6, # in hours
     'product_name': 'thunderbird-test', # Not valid for mobile builds
@@ -137,16 +136,17 @@ PLATFORM_VARS = {
                 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/tbirdbld_dsa",
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
+                'PYTHON26': '/tools/python-2.6.5/bin/python',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'enable_build_analysis': True,
             'talos_masters': None,
             'test_pretty_names': True,
             'l10n_check_test': False,
         },
@@ -277,16 +277,17 @@ PLATFORM_VARS = {
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/tbirdbld_dsa",
                 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64',
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
+                'PYTHON26': '/tools/python-2.6.5/bin/python',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'enable_build_analysis': True,
             'talos_masters': None,
             'test_pretty_names': True,
             'l10n_check_test': False,
         },
@@ -335,57 +336,16 @@ PLATFORM_VARS = {
                 'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': None,
             'unittest_masters': [],
             'test_pretty_names': False,
         },
-        'macosx': {
-            'product_name': 'thunderbird-test',
-            'app_name': 'mail',
-            'base_name': builder_prefix + 'OS X 10.5.2 %(branch)s',
-            'mozconfig': 'macosx/%(branch)s/nightly',
-            'run_alive_tests': False,
-            'src_mozconfig': 'mail/config/mozconfigs/macosx-universal/nightly',
-            'src_xulrunner_mozconfig': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
-            'src_shark_mozconfig': 'mail/config/mozconfigs/macosx-universal/shark',
-            'profiled_build': False,
-            'builds_before_reboot': thunderbird_localconfig.BUILDS_BEFORE_REBOOT,
-            'leak_target': 'mailbloat',
-            'build_space': 10,
-            'upload_symbols': True,
-            'download_symbols': True,
-            'packageTests': True,
-            'slaves': SLAVES['macosx'],
-            'platform_objdir': "%s/ppc" % OBJDIR,
-            'stage_product': 'thunderbird-test',
-            'stage_platform': 'macosx',
-            'update_platform': 'Darwin_Universal-gcc3',
-            'enable_shared_checkouts': True,
-            'enable_shark': False,
-            'env': {
-                'MOZ_OBJDIR': OBJDIR,
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'SYMBOL_SERVER_HOST': thunderbird_localconfig.SYMBOL_SERVER_HOST,
-                'SYMBOL_SERVER_USER': 'tbirdbld',
-                'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-                'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-                'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/tbirdbld_dsa",
-                'TINDERBOX_OUTPUT': '1',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'CHOWN_ROOT': '~/bin/chown_root',
-                'CHOWN_REVERT': '~/bin/chown_revert',
-                'LC_ALL': 'C',
-            },
-            'enable_opt_unittests': False,
-            'enable_checktests': True,
-            'talos_masters': None,
-        },
         'macosx64': {
             'product_name': 'thunderbird-test',
             'app_name': 'mail',
             'base_name': builder_prefix + 'OS X 10.6.2 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
             'run_alive_tests': False,
             'src_mozconfig': 'mail/config/mozconfigs/macosx-universal/nightly',
             'src_xulrunner_mozconfig': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
@@ -576,46 +536,16 @@ PLATFORM_VARS = {
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_unittests': False,
             'enable_checktests': True,
             'talos_masters': None,
         },
-        'macosx-debug': {
-            'product_name': 'thunderbird-test',
-            'app_name': 'mail',
-            'base_name': builder_prefix + 'OS X 10.5.2 %(branch)s leak test',
-            'mozconfig': 'macosx/%(branch)s/debug',
-            'run_alive_tests': False,
-            'src_mozconfig': 'mail/config/mozconfigs/macosx32/debug',
-            'profiled_build': False,
-            'builds_before_reboot': thunderbird_localconfig.BUILDS_BEFORE_REBOOT,
-            'download_symbols': True,
-            'packageTests': True,
-            'leak_target': 'mailbloat',
-            'build_space': 10,
-            'slaves': SLAVES['macosx'],
-            'platform_objdir': OBJDIR,
-            'stage_product': 'thunderbird-test',
-            'stage_platform': 'macosx-debug',
-            'enable_shared_checkouts': True,
-            'enable_shark': False,
-            'env': {
-                'MOZ_OBJDIR': OBJDIR,
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'LC_ALL': 'C',
-            },
-            'enable_unittests': False,
-            'enable_checktests': True,
-            'talos_masters': None,
-        },
         'macosx64-debug': {
             'product_name': 'thunderbird-test',
             'app_name': 'mail',
             'base_name': builder_prefix + 'OS X 10.6.2 %(branch)s leak test',
             'mozconfig': 'macosx64/%(branch)s/debug',
             'run_alive_tests': False,
             'src_mozconfig': 'mail/config/mozconfigs/macosx64/debug',
             'packageTests': True,
@@ -688,17 +618,16 @@ BRANCHES = {
         'lock_platforms': True,
         'platforms': {
             'linux': {},
             'linux64': {},
             'win32': {},
             'macosx64': {},
             'linux-debug': {},
             'linux64-debug': {},
-            'macosx-debug': {},
             'macosx64-debug': {},
             'win32-debug': {},
         },
     },
     'try-comm-central': {
     },
 }
 
@@ -780,17 +709,17 @@ BRANCHES['comm-central']['enable_mac_a11
 BRANCHES['comm-central']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['comm-central']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-central']['enable_l10n'] = True
 BRANCHES['comm-central']['enable_l10n_onchange'] = True
 BRANCHES['comm-central']['l10nNightlyUpdate'] = True
 BRANCHES['comm-central']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
+                                              'macosx64']
 BRANCHES['comm-central']['l10nDatedDirs'] = True
 BRANCHES['comm-central']['l10n_tree'] = 'fx37x'
 #make sure it has an ending slash
 BRANCHES['comm-central']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/thunderbird-test/nightly/latest-comm-central-l10n/'
 BRANCHES['comm-central']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-central'
 BRANCHES['comm-central']['allLocalesFile'] = 'mail/locales/all-locales'
@@ -824,17 +753,17 @@ BRANCHES['comm-release']['geriatric_mast
 BRANCHES['comm-release']['enable_mac_a11y'] = True
 # And code coverage
 BRANCHES['comm-release']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-release']['enable_l10n'] = False
 BRANCHES['comm-release']['enable_l10n_onchange'] = True
 BRANCHES['comm-release']['l10nNightlyUpdate'] = False
 BRANCHES['comm-release']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
+                                              'macosx64']
 BRANCHES['comm-release']['l10nDatedDirs'] = True
 BRANCHES['comm-release']['l10n_tree'] = 'fxrel'
 BRANCHES['comm-release']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-release'
 BRANCHES['comm-release']['allLocalesFile'] = 'mail/locales/all-locales'
 BRANCHES['comm-release']['localesURL'] = \
     '%s/build/buildbot-configs/raw-file/production/thunderbird/l10n/all-locales.comm-release' % (GLOBAL_VARS['hgurl'])
 BRANCHES['comm-release']['enable_multi_locale'] = True
@@ -855,17 +784,17 @@ BRANCHES['comm-esr10']['start_minute'] =
 BRANCHES['comm-esr10']['enable_xulrunner'] = False
 BRANCHES['comm-esr10']['enable_mac_a11y'] = True
 BRANCHES['comm-esr10']['pgo_strategy'] = 'per-checkin'
 # L10n configuration
 BRANCHES['comm-esr10']['enable_l10n'] = False
 BRANCHES['comm-esr10']['enable_l10n_onchange'] = False
 BRANCHES['comm-esr10']['l10nNightlyUpdate'] = False
 BRANCHES['comm-esr10']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
+                                            'macosx64']
 BRANCHES['comm-esr10']['l10nDatedDirs'] = True
 BRANCHES['comm-esr10']['l10n_tree'] = 'fxesr10'
 BRANCHES['comm-esr10']['enable_multi_locale'] = True
 BRANCHES['comm-esr10']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr10'
 BRANCHES['comm-esr10']['allLocalesFile'] = 'browser/locales/all-locales'
 BRANCHES['comm-esr10']['localesURL'] = \
     '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr10' % (GLOBAL_VARS['hgurl'])
@@ -902,17 +831,17 @@ BRANCHES['comm-beta']['enable_mac_a11y']
 BRANCHES['comm-beta']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['comm-beta']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-beta']['enable_l10n'] = False
 BRANCHES['comm-beta']['enable_l10n_onchange'] = True
 BRANCHES['comm-beta']['l10nNightlyUpdate'] = False
 BRANCHES['comm-beta']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
+                                           'macosx64']
 BRANCHES['comm-beta']['l10nDatedDirs'] = True
 BRANCHES['comm-beta']['l10n_tree'] = 'fxbeta'
 #make sure it has an ending slash
 BRANCHES['comm-beta']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/thunderbird-test/nightly/latest-comm-beta-l10n/'
 BRANCHES['comm-beta']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-beta'
 BRANCHES['comm-beta']['allLocalesFile'] = 'mail/locales/all-locales'
@@ -951,17 +880,17 @@ BRANCHES['comm-aurora']['enable_mac_a11y
 BRANCHES['comm-aurora']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['comm-aurora']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-aurora']['enable_l10n'] = True
 BRANCHES['comm-aurora']['enable_l10n_onchange'] = True
 BRANCHES['comm-aurora']['l10nNightlyUpdate'] = True
 BRANCHES['comm-aurora']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
+                                             'macosx64']
 BRANCHES['comm-aurora']['l10nDatedDirs'] = True
 BRANCHES['comm-aurora']['l10n_tree'] = 'fxaurora'
 #make sure it has an ending slash
 BRANCHES['comm-aurora']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/thunderbird-test/nightly/latest-comm-aurora-l10n/'
 BRANCHES['comm-aurora']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-aurora'
 BRANCHES['comm-aurora']['allLocalesFile'] = 'mail/locales/all-locales'
@@ -971,18 +900,18 @@ BRANCHES['comm-aurora']['enable_multi_lo
 # If True, a complete update snippet for this branch will be generated and
 # uploaded to. Any platforms with 'debug' in them will not have snippets
 # generated.
 BRANCHES['comm-aurora']['create_snippet'] = True
 BRANCHES['comm-aurora']['update_channel'] = 'aurora'
 BRANCHES['comm-aurora']['create_partial'] = True
 BRANCHES['comm-aurora']['create_partial_l10n'] = True
 # use comm-aurora-test when disabling updates for merges
-BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
-BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
+BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora-test'
+BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora-test'
 BRANCHES['comm-aurora']['enable_blocklist_update'] = True
 BRANCHES['comm-aurora']['blocklist_update_on_closed_tree'] = False
 del BRANCHES['comm-aurora']['platforms']['win64']
 BRANCHES['comm-aurora']['enable_valgrind'] = False
 
 ######## try
 # Try-specific configs
 BRANCHES['try-comm-central']['stage_username'] = 'tbirdtry'
@@ -1014,17 +943,16 @@ BRANCHES['try-comm-central']['aus2_base_
 BRANCHES['try-comm-central']['platforms']['linux']['slaves'] = TRY_SLAVES['linux']
 BRANCHES['try-comm-central']['platforms']['linux64']['slaves'] = TRY_SLAVES['linux64']
 BRANCHES['try-comm-central']['platforms']['win32']['slaves'] = TRY_SLAVES['win32']
 BRANCHES['try-comm-central']['platforms']['win64']['slaves'] = TRY_SLAVES['win64']
 BRANCHES['try-comm-central']['platforms']['macosx64']['slaves'] = TRY_SLAVES['macosx64']
 BRANCHES['try-comm-central']['platforms']['linux-debug']['slaves'] = TRY_SLAVES['linux']
 BRANCHES['try-comm-central']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['linux64']
 BRANCHES['try-comm-central']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win32']
-BRANCHES['try-comm-central']['platforms']['macosx-debug']['slaves'] = TRY_SLAVES['macosx']
 BRANCHES['try-comm-central']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64']
 BRANCHES['try-comm-central']['platforms']['linux']['upload_symbols'] = False
 BRANCHES['try-comm-central']['platforms']['linux64']['upload_symbols'] = False
 BRANCHES['try-comm-central']['platforms']['macosx64']['upload_symbols'] = False
 BRANCHES['try-comm-central']['platforms']['win32']['upload_symbols'] = True
 BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_USER'] = 'trybld'
 BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_PATH'] = '/symbols/windows'
 BRANCHES['try-comm-central']['platforms']['win32']['env']['SYMBOL_SERVER_SSH_KEY'] = '/c/Documents and Settings/cltbld/.ssh/trybld_dsa'
--- a/mozilla/thunderbird_preproduction_config.py
+++ b/mozilla/thunderbird_preproduction_config.py
@@ -1,48 +1,45 @@
 from preproduction_config import \
-    MAC_SNOW_MINIS, MAC_MINIS, XSERVES, WIN32_IXS, WIN64_IXS, LINUX_VMS, \
+    MAC_SNOW_MINIS, WIN32_IXS, WIN64_IXS, LINUX_VMS, \
     LINUX_IXS, LINUX64_VMS, LINUX64_IXS
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
     'macosx64':         MAC_SNOW_MINIS,
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,31)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
-TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
 TRY_WIN32_IXS  = []
 
 TRY_SLAVES = SLAVES
 TRY_SLAVES['linux'] += TRY_LINUX + TRY_LINUX_IXS
 TRY_SLAVES['linux64'] += TRY_LINUX64 + TRY_LINUX64_IXS
-TRY_SLAVES['macosx'] += TRY_MAC
 TRY_SLAVES['macosx64'] += TRY_MAC64
 TRY_SLAVES['win32'] += TRY_WIN32_IXS
 
 
 GLOBAL_VARS = {
     'staging': True,
     #XXX 'config_repo_path': 'build/buildbot-configs',
     'config_repo_path': 'users/john.hopkins_mozillamessaging.com/buildbot-configs-stage',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
     'stage_server': 'preproduction-stage.srv.releng.scl3.mozilla.com',
     'aus2_user': 'cltbld',
     'aus2_ssh_key': 'cltbld_dsa',
     'aus2_host': 'preproduction-stage.srv.releng.scl3.mozilla.com',
     'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird-test',
-    'graph_server': None, #XXX reenable once graph server has Thunderbird entries
+    'graph_server': 'graphs.allizom.org',
     'build_tools_repo_path': 'build/tools',
     'base_clobber_url': 'http://build.mozilla.org/preproduction-clobberer/index.php',
     'pollInterval': 6*60*60,
     'l10nPollInterval': 6*60*60,
     'disable_tinderbox_mail': True,
     'talos_masters': [],
     # List of unittest masters to notify of new builds to test,
     # if a failure to notify the master should result in a warning,
--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -1,38 +1,36 @@
 from copy import deepcopy
 
 from production_config import \
-    GLOBAL_VARS, MAC_LION_MINIS, MAC_SNOW_MINIS, MAC_MINIS, XSERVES, \
+    GLOBAL_VARS, MAC_LION_MINIS, MAC_SNOW_MINIS, \
     LINUX_VMS, LINUX_IXS, LINUX64_VMS, LINUX64_IXS, WIN32_IXS, WIN64_IXS, \
     WIN64_IXS, MOCK_DL120G7, \
-    TRY_LINUX, TRY_LINUX_IXS, TRY_LINUX64, TRY_LINUX64_IXS, TRY_MAC, \
-    TRY_XSERVES, TRY_MAC64, TRY_WIN32_IXS, TRY_WIN64_IXS, TRY_MOCK_DL120G7, \
+    TRY_LINUX, TRY_LINUX_IXS, TRY_LINUX64, TRY_LINUX64_IXS, \
+    TRY_MAC64, TRY_WIN32_IXS, TRY_WIN64_IXS, TRY_MOCK_DL120G7, \
     TRY_LION, \
     BUILDS_BEFORE_REBOOT, SYMBOL_SERVER_HOST
 
 GLOBAL_VARS = deepcopy(GLOBAL_VARS)
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'mock':             MOCK_DL120G7
 }
 
 TRY_SLAVES = {
     'linux':       TRY_LINUX + TRY_LINUX_IXS,
     'linux64':     TRY_LINUX64 + TRY_LINUX64_IXS,
     'win32':       TRY_WIN32_IXS,
     'win64':       TRY_WIN64_IXS,
-    'macosx':      TRY_MAC + TRY_XSERVES,
     'macosx64':    TRY_MAC64,
     'macosx64-lion': TRY_LION,
     'mock':        TRY_MOCK_DL120G7,
 }
 
 # Local overrides for default values
 GLOBAL_VARS['download_base_url'] = 'http://ftp.mozilla.org/pub/mozilla.org/thunderbird-test'
 GLOBAL_VARS['talos_masters'] = []
--- a/mozilla/thunderbird_staging_config.py
+++ b/mozilla/thunderbird_staging_config.py
@@ -1,48 +1,45 @@
 from staging_config import \
-    MAC_SNOW_MINIS, MAC_MINIS, XSERVES, WIN32_IXS, WIN64_IXS, LINUX_VMS, \
+    MAC_SNOW_MINIS, WIN32_IXS, WIN64_IXS, LINUX_VMS, \
     LINUX_IXS, LINUX64_VMS, LINUX64_IXS
     
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           MAC_MINIS + XSERVES,
     'macosx64':         MAC_SNOW_MINIS,
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,31)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
-TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
 TRY_WIN32_IXS  = []
 
 TRY_SLAVES = SLAVES
 TRY_SLAVES['linux'] += TRY_LINUX + TRY_LINUX_IXS
 TRY_SLAVES['linux64'] += TRY_LINUX64 + TRY_LINUX64_IXS
-TRY_SLAVES['macosx'] += TRY_MAC
 TRY_SLAVES['macosx64'] += TRY_MAC64
 TRY_SLAVES['win32'] += TRY_WIN32_IXS
 
 
 GLOBAL_VARS = {
     'staging': True,
     #XXX 'config_repo_path': 'build/buildbot-configs',
     'config_repo_path': 'users/john.hopkins_mozillamessaging.com/buildbot-configs-stage',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
     'stage_server': 'dev-stage01.build.sjc1.mozilla.com',
     'aus2_user': 'cltbld',
     'aus2_ssh_key': 'cltbld_dsa',
     'aus2_host': 'dev-stage01.build.sjc1.mozilla.com',
     'download_base_url': 'http://dev-stage01.build.sjc1.mozilla.com/pub/mozilla.org/thunderbird-test',
-    'graph_server': None, #XXX reenable once graph server has Thunderbird entries
+    'graph_server': 'graphs.allizom.org',
     'build_tools_repo_path': 'build/tools',
     'base_clobber_url': 'http://build.mozilla.org/stage-clobberer/index.php',
     'disable_tinderbox_mail': True,
     'talos_masters': [],
     # List of unittest masters to notify of new builds to test,
     # if a failure to notify the master should result in a warning,
     # and sendchange retry count before give up
     'unittest_masters': [
--- a/mozilla/try_localconfig.py
+++ b/mozilla/try_localconfig.py
@@ -17,26 +17,26 @@ if 'ssh_port' in master_config:
     c['manhole'] = manhole.PasswordManhole(
             "tcp:%(ssh_port)i:interface=127.0.0.1" % master_config,
             "cltbld", "password")
 
 from config import BRANCHES, TRY_SLAVES
 ACTIVE_BRANCHES = ['try']
 ACTIVE_THUNDERBIRD_BRANCHES = ['try-comm-central']
 ACTIVE_RELEASE_BRANCHES = []
+ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = []
 ACTIVE_MOBILE_RELEASE_BRANCHES = []
 ACTIVE_PROJECTS = []
 
 # Override with TRY_SLAVES
 SLAVES = TRY_SLAVES
 
 # Set up our fast slaves
 # No need to reload, this is reloaded by builder_master.cfg
 import buildbotcustom.misc
 buildbotcustom.misc.fastRegexes.extend([
     'linux-ix-',
     'linux64-ix-',
-    'xserve',
     ])
 ENABLE_RELEASES = False
 RESERVED_SLAVES = None
 
 QUEUEDIR = master_config.get("queuedir", "/dev/shm/queue")
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -1,14 +1,17 @@
 # import/reload dance so that reconfigs work
 # buildbotcustom.misc has to be imported/reloaded prior to master_localconfig
 # so that the fastRegexes don't get reset
 # vim: ft=python
 import os, sys
 
+# NOTE: builder_master.cfg and universal_master_sqlite.cfg need to be kept in sync
+#       as much of the logic is duplicated between them.
+
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
 import master_localconfig
 import build.paths
 reload(buildbotcustom.misc)
@@ -38,31 +41,33 @@ c['status'].append(QueuedCommandHandler(
     command=[sys.executable, os.path.join(os.path.dirname(buildbotcustom.__file__), 'bin', 'postrun.py'), '-c', os.path.abspath(os.path.join(os.curdir, 'postrun.cfg'))],
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PROJECTS, SLAVES, \
          ENABLE_RELEASES, RESERVED_SLAVES, ACTIVE_RELEASE_BRANCHES, \
-         ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_BRANCHES
+         ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_BRANCHES, \
+         ACTIVE_THUNDERBIRD_RELEASE_BRANCHES
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
+
 for platform, names in SLAVES.items():
     for name in names:
         c['slaves'].append(BuildSlave(name, SlavePasswords[platform], max_builds=1))
 
 for branch in BRANCHES:
     BRANCHES[branch]['l10n_slaves'] = SLAVES
 
 from buildbotcustom.misc import generateBranchObjects, generateProjectObjects, \
-    mergeBuildObjects, setReservedFileName
+     mergeBuildObjects, setReservedFileName
 
 # Required for sendchange
 from buildbot.changes.pb import PBChangeSource
 c['change_source'].append(PBChangeSource())
 
 buildObjects = {'builders': [], 'status': [], 'change_source': [], 'schedulers': []}
 
 import passwords
@@ -91,37 +96,38 @@ for project in ACTIVE_PROJECTS:
 for cs in buildObjects['change_source'][:]:
     cnt = 0
     for x in buildObjects['change_source']:
         if x.branch == cs.branch:
             cnt = cnt + 1
     if cnt > 1:
         buildObjects['change_source'].remove(cs)
 
-
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])
 c['change_source'].extend(buildObjects['change_source'])
 c['schedulers'].extend(buildObjects['schedulers'])
 
 if ENABLE_RELEASES:
     import buildbotcustom.process.release
     reload(buildbotcustom.process.release)
     from buildbotcustom.process.release import generateReleaseBranchObjects
     if RESERVED_SLAVES:
         setReservedFileName(RESERVED_SLAVES)
-    for product, sourceRepoKey, releaseBranch in \
-            [('firefox', 'mozilla', b)
+    for product, sourceRepoKey, productBranches, releaseBranch in \
+            [('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
+             for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
+            [('firefox', 'mozilla', BRANCHES, b)
              for b in ACTIVE_RELEASE_BRANCHES] + \
-            [('fennec', 'mobile', b)
+            [('fennec', 'mobile', BRANCHES, b)
              for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
         releaseBranchConfig = {}
         releaseConfigFile = "release-%s-%s.py" % (product, releaseBranch)
         execfile(releaseConfigFile, releaseBranchConfig, releaseBranchConfig)
-        branchConfig = BRANCHES[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
+        branchConfig = productBranches[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
         releaseObjects = generateReleaseBranchObjects(
             releaseBranchConfig['releaseConfig'], branchConfig,
             releaseConfigFile=getRealpath(releaseConfigFile),
             sourceRepoKey=sourceRepoKey,
             secrets=getattr(passwords, 'secrets', None)
         )
         for key in releaseObjects.keys():
             c[key].extend(releaseObjects[key])
@@ -150,18 +156,17 @@ if hasattr(passwords, 'PULSE_PASSWORD'):
 # same thing
 assert c is BuildmasterConfig
 
 # Check that all our builders have branch, platform and product set
 for b in c['builders']:
     assert 'properties' in b, b
     assert 'branch' in b['properties'], b
     assert 'platform' in b['properties'], b
-    if not 'coverage' in b['name']:
-        assert 'product' in b['properties'], b
+    assert 'product' in b['properties'], b
 
 # Check that we don't have more too many  builders for any one slave
 _buildersBySlave = {}
 for b in c['builders']:
     for s in b['slavenames']:
         _buildersBySlave[s] = _buildersBySlave.get(s, 0) + 1
 
 for s, count in _buildersBySlave.items():
--- a/setup-master.py
+++ b/setup-master.py
@@ -200,16 +200,17 @@ def load_masters_json(masters_json, role
                 raise AssertionError("What is a %s role?" % m['role'])
 
         if m['role'] == 'build':
             c.config_dir = 'mozilla'
             c.globs.append('l10n-changesets*')
             c.globs.append('release_templates')
             c.globs.append('release-firefox*.py')
             c.globs.append('release-fennec*.py')
+            c.globs.append('release-thunderbird*.py')
             c.globs.append(mastercfg)
             c.globs.append('build_localconfig.py')
             c.local_links.append((mastercfg, 'master.cfg'))
             c.local_links.append(('build_localconfig.py', 'master_localconfig.py'))
         elif m['role'] == 'try':
             c.config_dir = 'mozilla'
             c.local_links.append((mastercfg, 'master.cfg'))
             c.local_links.append(('try_localconfig.py', 'master_localconfig.py'))
@@ -257,26 +258,29 @@ mozilla_base = MasterConfig(
                'release_templates'],
         renames=[
             ('BuildSlaves.py.template', 'BuildSlaves.py'),
             ('passwords.py.template', 'passwords.py'),
             ],
         )
 
 mozilla_production = mozilla_base + MasterConfig(
-    globs=['release-firefox-*.py', 'release-fennec-*.py'],
+    globs=['release-firefox-*.py', 'release-fennec-*.py', 'release-thunderbird-*.py'],
     )
 
 mozilla_staging = mozilla_base + MasterConfig(
     globs=['staging_release-*-*.py'],
     local_links=[('staging_release-firefox-mozilla-%s.py' % v,
                   'release-firefox-mozilla-%s.py' % v)
                  for v in ['1.9.2', 'beta', 'release']] + \
                 [('staging_release-fennec-mozilla-%s.py' % v,
                   'release-fennec-mozilla-%s.py' % v)
+                 for v in ['beta', 'release']] + \
+                [('staging_release-thunderbird-comm-%s.py' % v,
+                  'release-thunderbird-comm-%s.py' % v)
                  for v in ['beta', 'release']]
     )
 
 mozilla_staging_scheduler_master_sm01 = mozilla_staging + MasterConfig(
         "staging-scheduler_master",
         local_links = [
             ('staging_scheduler_master_sm01_localconfig.py', 'master_localconfig.py'),
             ('staging_config.py', 'localconfig.py'),