Bug 1080633 - Kill mozilla-esr24 branch. r=pmoore
authorRail Aliiev <rail@mozilla.com>
Fri, 17 Oct 2014 08:11:11 -0400 (2014-10-17)
changeset 11220 399fe52bdd6a40c590719c6eaab0bc27a5e6d8a6
parent 11218 0d7b2e025dc6a7b0d983135b294a1a6b160a3000
child 11221 cdc5c6586ceaffa970d621bdff07c864aab01c3a
push id8222
push userraliiev@mozilla.com
push dateFri, 17 Oct 2014 12:11:15 +0000 (2014-10-17)
reviewerspmoore
bugs1080633
Bug 1080633 - Kill mozilla-esr24 branch. r=pmoore
mozilla-tests/config.py
mozilla-tests/mobile_config.py
mozilla/config.py
mozilla/preproduction_release_overrides-esr24.py
mozilla/release-firefox-mozilla-esr24.py
mozilla/release-firefox-mozilla-esr24.py.template
mozilla/release-thunderbird-comm-esr24.py
mozilla/release-thunderbird-comm-esr24.py.template
mozilla/staging_release-firefox-mozilla-esr24.py
mozilla/staging_release-firefox-mozilla-esr24.py.template
mozilla/staging_release-firefox-mozilla-esr31.py
mozilla/staging_release-thunderbird-comm-esr24.py
mozilla/staging_release-thunderbird-comm-esr24.py.template
mozilla/thunderbird_config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1747,31 +1747,16 @@ for name in [x for x in BRANCHES.keys() 
                 continue
             branch['platforms'][pf][slave_pf]['opt_unittest_suites'].append(('jetpack', ['jetpack']))
             branch['platforms'][pf][slave_pf]['debug_unittest_suites'].append(('jetpack', ['jetpack']))
 
 # cppunittest jobs ride the train with 28, so they need to be disabled
 # for branches running an older version.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=937637
 for platform in PLATFORMS.keys():
-    for name, branch in items_before(BRANCHES, 'gecko_version', 28):
-        if platform not in branch['platforms']:
-            continue
-        for slave_platform in PLATFORMS[platform]['slave_platforms']:
-            if slave_platform not in branch['platforms'][platform]:
-                continue
-
-            for suite_type in ['opt_unittest_suites', 'debug_unittest_suites']:
-                for cpp_suite in CPPUNIT:
-                    try:
-                        branch['platforms'][platform][slave_platform][suite_type].remove(cpp_suite)
-                    except ValueError:
-                        # wasn't in the list anyways
-                        pass
-
     # See Bug 997946 - skip these on OS X 10.8 due to limited capacity
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 28):
         if platform not in branch['platforms']:
             continue
         if 'mountainlion' in PLATFORMS[platform]['slave_platforms']:
             if 'mountainlion' not in branch['platforms'][platform]:
                 continue
 
@@ -2007,21 +1992,16 @@ for s in ('tp5o-e10s', 'svgr-e10s', 'xpe
 
 # LOOOOOOOOOOOOOOOPS
 # Enable win64 testing on select branches only
 WIN64_TESTING_BRANCHES = ['date']
 for branch in set(BRANCHES.keys()) - set(WIN64_TESTING_BRANCHES):
     if 'win64' in BRANCHES[branch]['platforms']:
         del BRANCHES[branch]['platforms']['win64']
 
-# ASAN builds/tests should ride the trains for gecko 26
-for name, branch in items_before(BRANCHES, 'gecko_version', 26):
-    if 'linux64-asan' in branch['platforms']:
-        del branch['platforms']['linux64-asan']
-
 # Disable Linux64-cc in every branch except cedar
 for name in BRANCHES.keys():
     if name in ('cedar',):
         continue
     for platform in ('linux64-cc',):
         if platform in BRANCHES[name]['platforms']:
             del BRANCHES[name]['platforms'][platform]
 
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1468,17 +1468,17 @@ PLATFORM_UNITTEST_VARS = {
     'android-armv6': {
         'product_name': 'fennec',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'is_remote': True,
         'host_utils_url': 'http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.%%(foopy_type)s.742597.zip',
         'enable_opt_unittests': True,
         'enable_debug_unittests': False,
-        'remote_extras': ANDROID_UNITTEST_REMOTE_EXTRAS,        
+        'remote_extras': ANDROID_UNITTEST_REMOTE_EXTRAS,
         'ubuntu64_vm_armv6_mobile': {
             'opt_unittest_suites': [],
             'debug_unittest_suites': [],
         },
         'ubuntu64_vm_armv6_large': {
             'opt_unittest_suites': [],
             'debug_unittest_suites': [],
         },
@@ -1644,35 +1644,16 @@ for name, branch in items_at_least(BRANC
             'opt_unittest_suites': deepcopy(ANDROID_2_3_C3_DICT['opt_unittest_suites']),
             'debug_unittest_suites': []
         }
         BRANCHES[name]['platforms']['android']['ubuntu64_vm_mobile'] = {
             'opt_unittest_suites': deepcopy(ANDROID_2_3_AWS_DICT['opt_unittest_suites']),
             'debug_unittest_suites': []
         }
 
-# Panda debug enabled on trunk that rides the trains
-# this stanza is to disable it for branches on an older version of gecko
-for name, branch in items_before(BRANCHES, 'gecko_version', 31):
-    # Loop removes it from any branch that gets beyond here
-    for platform in branch['platforms']:
-        if not platform in PLATFORMS:
-            continue
-        if not platform == ('android'):
-            continue
-        for slave_plat in PLATFORMS[platform]['slave_platforms']:
-            if not slave_plat in branch['platforms'][platform]:
-                continue
-            if not 'panda' in slave_plat:
-                continue
-            if not branch['platforms'][platform][slave_plat]['debug_unittest_suites']:
-                continue
-            else:
-                branch['platforms'][platform]['enable_debug_unittests'] = False
-
 BRANCHES['cedar']['platforms']['android']['enable_debug_unittests'] = True
 BRANCHES['cedar']['platforms']['android']['panda_android']['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_PLAIN_ROBOCOP + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_MOCHITESTGL + ANDROID_MOZHARNESS_PLAIN_REFTEST + ANDROID_MOZHARNESS_XPCSHELL + ANDROID_MOZHARNESS_JITTEST + ANDROID_MOZHARNESS_CPPUNITTEST)
 
 # bug 1030753 limit the debug tests run on trunk branches
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 34):
     # Loop removes it from any branch that gets beyond here
     if name in ('cedar', ):
         continue
@@ -1691,76 +1672,16 @@ for name, branch in items_at_least(BRANC
             if branch['platforms'][platform]['enable_debug_unittests'] is True:
                 for type in branch['platforms'][platform][slave_plat]:
                     if 'debug_unittest_suite' in type:
                         BRANCHES[name]['platforms'][platform][slave_plat]['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_PLAIN_REFTEST)
 
 # have to disable this manually or it blows up in misc.py
 BRANCHES['ash']['platforms']['android']['enable_debug_unittests'] = False
 
-# Panda XPCShell
-for name, branch in items_before(BRANCHES, 'gecko_version', 28):
-    # Loop removes it from any branch that gets beyond here
-    for platform in branch['platforms']:
-        if not platform in PLATFORMS:
-            continue
-        if not platform.startswith('android'):
-            continue
-        if platform.endswith('-debug'):
-            continue  # no slave_platform for debug
-        for slave_plat in PLATFORMS[platform]['slave_platforms']:
-            if not slave_plat in branch['platforms'][platform]:
-                continue
-            if not 'panda' in slave_plat:
-                continue
-            for type in branch['platforms'][platform][slave_plat]:
-                for suite in branch['platforms'][platform][slave_plat][type][:]:
-                    if "xpcshell" in suite[0]:
-                        branch['platforms'][platform][slave_plat][type].remove(suite)
-
-# panda reftests jobs ride the train with 29, so they need to be disabled
-# for branches running an older version.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=929447
-for name, branch in items_before(BRANCHES, 'gecko_version', 29):
-    for platform in branch['platforms']:
-        if platform not in PLATFORMS:
-            continue
-        for slave_plat in PLATFORMS[platform].get('slave_platforms', {}):
-            # we don't want to change scheduling for non panda slaves
-            # https://bugzilla.mozilla.org/show_bug.cgi?id=961575
-            if not 'panda_android' in slave_plat:
-                continue
-            if slave_plat not in branch['platforms'][platform]:
-                continue
-            for type_ in branch['platforms'][platform][slave_plat]:
-                for suite in branch['platforms'][platform][slave_plat][type_][:]:
-                    if "plain-reftest" in suite[0]:
-                        branch['platforms'][platform][slave_plat][type_].remove(suite)
-
-# Disable Android x86 on branches that are older than gecko 29
-# should not run Android x86 jobs
-for name, branch in items_before(BRANCHES, 'gecko_version', 29):
-    if 'android-x86' in branch['platforms']:
-        branch['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] = []
-
-# cppunittest jobs ride the train with 28, so they need to be disabled
-# for branches running an older version.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=937637
-for name, branch in items_before(BRANCHES, 'gecko_version', 28):
-    for platform in branch['platforms']:
-        if platform not in PLATFORMS:
-            continue
-        for slave_plat in PLATFORMS[platform].get('slave_platforms', {}):
-            if slave_plat not in branch['platforms'][platform]:
-                continue
-            for type_ in branch['platforms'][platform][slave_plat]:
-                for suite in branch['platforms'][platform][slave_plat][type_][:]:
-                    if "cppunit" in suite[0]:
-                        branch['platforms'][platform][slave_plat][type_].remove(suite)
-
 
 def remove_suite_from_slave_platform(BRANCHES, PLATFORMS, suite_to_remove, slave_platform, branches_to_keep=[]):
     """Remove suites named like |suite_to_remove| from all branches on slave platforms named like |slave_platform|.
 
 Updates BRANCHES in place.  Consumes PLATFORMS without side
 effects. Does not remove any suites from the specified
 |branches_to_keep|."""
 
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2452,21 +2452,16 @@ for b, branch in BRANCHES.items():
         project = deepcopy(branch_project)
         project['project_name'] = name
         project['branch'] = b
         project['branchconfig'] = branch
         branch_project_name = '%s__%s' % (name, b)
         assert branch_project_name not in PROJECTS, '%s already in PROJECTS' % name
         PROJECTS[branch_project_name] = project
 
-for _, branch in items_before(BRANCHES, 'gecko_version', 26):
-    for p in 'linux64-asan', 'linux64-asan-debug':
-        if p in branch['platforms']:
-            del branch['platforms'][p]
-
 # ant test on try
 ## ant rides the trains (Bug 971841)
 # for name, branch in items_before(BRANCHES, 'gecko_version', 30):
 for name, branch in BRANCHES.items():
     if "try" in name:
         continue # Remove this condition when we switch to riding trains
     for plat, pc in branch['platforms'].items():
         if 'mock_packages' in pc and "android" in plat:
@@ -2495,20 +2490,16 @@ for name, branch in items_before(BRANCHE
 # Only test pretty names on train branches, not m-c or project branches.
 # That's also forced on nonunified builds in buildbotcustom.
 for branch in ("mozilla-aurora", "mozilla-beta", "mozilla-release",
                "mozilla-esr31"):
     for platform in ("linux", "linux64", "macosx64", "win32", "win64"):
         if platform in BRANCHES[branch]['platforms']:
             BRANCHES[branch]['platforms'][platform]['test_pretty_names'] = True
 
-# Exact rooting landed for desktop only in 28.
-for name, branch in items_before(BRANCHES, 'gecko_version', 28):
-    if 'linux64-br-haz' in branch['platforms']:
-        del branch['platforms']['linux64-br-haz']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 28):
     # b2g cannot use exact rooting yet since it has known hazards. If a
     # b2g-only tree were to acquire additional desktop-only hazard, we
     # currently would not care. Eventually, we will get the analysis running on
     # b2g, fix the hazards, turn on exact rooting for b2g, and then turn these
     # builds on.
     if 'b2g' in name and 'inbound' not in name:
         if 'linux64-br-haz' in branch['platforms']:
deleted file mode 100644
--- a/mozilla/preproduction_release_overrides-esr24.py
+++ /dev/null
@@ -1,8 +0,0 @@
-releaseConfig['sourceRepositories']['mozilla']['path'] = 'users/prepr-ffxbld/mozilla-esr24'
-releaseConfig['sourceRepositories']['mozilla']['clonePath'] = 'releases/mozilla-esr24'
-releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-esr24'
-releaseConfig['otherReposToTag']     = {
-    'users/prepr-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
-    'users/prepr-ffxbld/buildbot': 'production-0.8',
-    'users/prepr-ffxbld/mozharness': 'production',
-}
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr24.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-releaseConfig = {}
-
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release@mozilla.com>',
-                                        '<release-mgmt@mozilla.com>',
-                                        '<qa-drivers@mozilla.com>']
-releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
-releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'firefox'
-releaseConfig['stage_product']       = 'firefox'
-releaseConfig['appName']             = 'browser'
-#  Current version info
-releaseConfig['version']             = '24.8.1esr'
-releaseConfig['appVersion']          = '24.8.1'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'FIREFOX_24_8_1esr'
-releaseConfig['partialUpdates']      = {
-
-    '24.8.0esr': {
-        'appVersion': '24.8.0',
-        'buildNumber': 1,
-        'baseTag': 'FIREFOX_24_8_0esr',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '24.8.1esrpre'
-releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'path': 'releases/mozilla-esr24',
-        'revision': '1a4ef6655b21',
-        '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-changesets_mozilla-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_0_9_5',
-    'build/buildbot': 'production-0.8',
-    'build/partner-repacks': 'default',
-    'build/mozharness': 'production',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = releaseConfig['enUSPlatforms']
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'browser/locales/shipped-locales'
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'ffxbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozEsr24-branch-patcher2.cfg'
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus3.mozilla.org'
-releaseConfig['ausHost']             = 'aus3-staging.mozilla.org'
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_dsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = None
-releaseConfig['useBetaChannel']      = 1
-releaseConfig['updateVerifyChunks']  = 6
-releaseConfig['verifyConfigs']       = {
-    'linux':  'mozEsr24-firefox-linux.cfg',
-    'linux64':  'mozEsr24-firefox-linux64.cfg',
-    'macosx64': 'mozEsr24-firefox-mac64.cfg',
-    'win32':  'mozEsr24-firefox-win32.cfg'
-}
-releaseConfig['mozconfigs']          = {
-    'linux': 'browser/config/mozconfigs/linux32/release',
-    'linux64': 'browser/config/mozconfigs/linux64/release',
-    'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
-    'win32': 'browser/config/mozconfigs/win32/release',
-}
-releaseConfig['releaseChannel']        = 'esr'
-releaseConfig['releaseChannelRuleIds'] = []
-releaseConfig['localTestChannel']      = 'esrtest'
-releaseConfig['cdnTestChannel']        = 'releasetest'
-releaseConfig['testChannelRuleIds']    = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr24.py.template
+++ /dev/null
@@ -1,144 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-releaseConfig = {}
-
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release@mozilla.com>',
-                                        '<release-mgmt@mozilla.com>',
-                                        '<qa-drivers@mozilla.com>']
-releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
-releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'firefox'
-releaseConfig['stage_product']       = 'firefox'
-releaseConfig['appName']             = 'browser'
-#  Current version info
-releaseConfig['version']             = '{{ version }}'
-releaseConfig['appVersion']          = '{{ appVersion }}'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = {{ buildNumber }}
-releaseConfig['baseTag']             = '{{ baseTag }}'
-releaseConfig['partialUpdates']      = {
-{% for version, partial in partials.items() %}
-    '{{ version }}': {
-        'appVersion': '{{ partial['appVersion'] }}',
-        'buildNumber': {{ partial['buildNumber'] }},
-        'baseTag': '{{ partial['baseTag'] }}',
-    },
-{% endfor %}
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '{{ version }}pre'
-releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'path': '{{ branch }}',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        '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-changesets_mozilla-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_0_9_5',
-    'build/buildbot': 'production-0.8',
-    'build/mozharness': 'production',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = releaseConfig['enUSPlatforms']
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'browser/locales/shipped-locales'
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'ffxbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozEsr24-branch-patcher2.cfg'
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus3.mozilla.org'
-releaseConfig['ausHost']             = 'aus3-staging.mozilla.org'
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_dsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-releaseConfig['useBetaChannel']      = 1
-releaseConfig['updateVerifyChunks']  = 6
-releaseConfig['verifyConfigs']       = {
-    'linux':  'mozEsr24-firefox-linux.cfg',
-    'linux64':  'mozEsr24-firefox-linux64.cfg',
-    'macosx64': 'mozEsr24-firefox-mac64.cfg',
-    'win32':  'mozEsr24-firefox-win32.cfg'
-}
-releaseConfig['mozconfigs']          = {
-    'linux': 'browser/config/mozconfigs/linux32/release',
-    'linux64': 'browser/config/mozconfigs/linux64/release',
-    'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
-    'win32': 'browser/config/mozconfigs/win32/release',
-}
-releaseConfig['releaseChannel']        = 'esr'
-releaseConfig['releaseChannelRuleIds'] = []
-releaseConfig['localTestChannel']      = 'esrtest'
-releaseConfig['cdnTestChannel']        = 'releasetest'
-releaseConfig['testChannelRuleIds']    = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-esr24.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-releaseConfig = {}
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release@mozilla.com>']
-releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
-releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'thunderbird'
-releaseConfig['stage_product']       = 'thunderbird'
-releaseConfig['appName']             = 'mail'
-releaseConfig['mozilla_dir']         = 'mozilla'
-releaseConfig['mozilla_srcdir']      = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '24.8.1'
-releaseConfig['appVersion']          = '24.8.1'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_24_8_1'
-releaseConfig['partialUpdates']      = {}  # No more supported
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr24',
-        'path': 'releases/comm-esr24',
-        'revision': '41aefb13384e',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'path': 'releases/mozilla-esr24',
-        'revision': '1a4ef6655b21',
-        'relbranch': None,
-        'bumpFiles': {
-            '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-changesets_thunderbird-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_AUTOMATION',
-    'build/buildbot': 'production-0.8',
-    'build/mozharness': 'production',
-}
-
-# 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['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = False
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'tbirdbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/tbirdbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = None
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus3.mozilla.org'
-releaseConfig['ausHost']             = 'aus3-staging.mozilla.org'
-releaseConfig['ausUser']             = 'tbirdbld'
-releaseConfig['ausSshKey']           = 'tbirdbld_dsa'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = None
-releaseConfig['updateVerifyChunks']  = 6
-releaseConfig['verifyConfigs']       = {}
-releaseConfig['skip_updates']        = True
-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']      = 'release'
-releaseConfig['localTestChannel']    = ''
-releaseConfig['cdnTestChannel']      = ''
-releaseConfig['testChannelRuleIds']  = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-esr24.py.template
+++ /dev/null
@@ -1,136 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-releaseConfig = {}
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release@mozilla.com>']
-releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
-releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'thunderbird'
-releaseConfig['stage_product']       = 'thunderbird'
-releaseConfig['appName']             = 'mail'
-releaseConfig['mozilla_dir']         = 'mozilla'
-releaseConfig['mozilla_srcdir']      = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '{{ version }}'
-releaseConfig['appVersion']          = '{{ appVersion }}'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = {{ buildNumber }}
-releaseConfig['baseTag']             = '{{ baseTag }}'
-releaseConfig['partialUpdates']      = {}  # No more supported
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr24',
-        'path': 'releases/comm-esr24',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'path': 'releases/mozilla-esr24',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            '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-changesets_thunderbird-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_AUTOMATION',
-    'build/buildbot': 'production-0.8',
-    'build/mozharness': 'production',
-}
-
-# 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['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = False
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'tbirdbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/tbirdbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = None
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus3.mozilla.org'
-releaseConfig['ausHost']             = 'aus3-staging.mozilla.org'
-releaseConfig['ausUser']             = 'tbirdbld'
-releaseConfig['ausSshKey']           = 'tbirdbld_dsa'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-releaseConfig['updateVerifyChunks']  = 6
-releaseConfig['verifyConfigs']       = {}
-releaseConfig['skip_updates']        = True
-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']      = 'release'
-releaseConfig['localTestChannel']    = ''
-releaseConfig['cdnTestChannel']      = ''
-releaseConfig['testChannelRuleIds']  = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr24.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-releaseConfig['skip_repo_setup']        = True
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer-stage.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
-releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[staging-release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'firefox'
-releaseConfig['stage_product']       = 'firefox'
-releaseConfig['appName']             = 'browser'
-#  Current version info
-releaseConfig['version']             = '24.0esr'
-releaseConfig['appVersion']          = '24.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'FIREFOX_24_0esr'
-releaseConfig['partialUpdates']      = {}  # TODO for 24.0.1esr
-#  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']  = {
-    'mozilla': {
-        'name': 'mozilla-esr24',
-        'clonePath': 'releases/mozilla-esr24',
-        'path': 'users/stage-ffxbld/mozilla-esr24',
-        '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_mozilla-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'users/stage-ffxbld/compare-locales': 'RELEASE_0_9_5',
-    'users/stage-ffxbld/buildbot': 'production-0.8',
-    'users/stage-ffxbld/partner-repacks': 'default',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = releaseConfig['enUSPlatforms']
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'browser/locales/shipped-locales'
-releaseConfig['l10nChunks']          = 6
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozEsr24-branch-patcher2.cfg'  # TODO for 17.0.1esr
-releaseConfig['ftpServer']           = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['stagingServer']       = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausHost']             = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_dsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['verifyConfigs']       = {}  # TODO for 24.0.1esr
-releaseConfig['mozconfigs']          = {
-    'linux': 'browser/config/mozconfigs/linux32/release',
-    'linux64': 'browser/config/mozconfigs/linux64/release',
-    'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
-    'win32': 'browser/config/mozconfigs/win32/release',
-}
-releaseConfig['releaseChannel']      = 'esr'
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.allizom.org/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr24.py.template
+++ /dev/null
@@ -1,147 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-releaseConfig['skip_repo_setup']        = True
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer-stage.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
-releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[staging-release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'firefox'
-releaseConfig['stage_product']       = 'firefox'
-releaseConfig['appName']             = 'browser'
-#  Current version info
-releaseConfig['version']             = '{{ version }}'
-releaseConfig['appVersion']          = '{{ appVersion }}'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = {{ buildNumber }}
-releaseConfig['baseTag']             = '{{ baseTag }}'
-releaseConfig['partialUpdates']      = {
-{% for version, partial in partials.items() %}
-    '{{ version }}': {
-        'appVersion': '{{ partial['appVersion'] }}',
-        'buildNumber': {{ partial['buildNumber'] }},
-        'baseTag': '{{ partial['baseTag'] }}',
-    },
-{% endfor %}
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '{{ version }}pre'
-releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
-#  Repository configuration, for tagging
-## Staging repository path
-releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'clonePath': 'releases/mozilla-esr24',
-        'path': '{{ branch }}',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        '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_mozilla-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'users/stage-ffxbld/compare-locales': 'RELEASE_0_9_5',
-    'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = releaseConfig['enUSPlatforms']
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'browser/locales/shipped-locales'
-releaseConfig['l10nChunks']          = 6
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozEsr24-branch-patcher2.cfg'
-releaseConfig['ftpServer']           = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['stagingServer']       = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausHost']             = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_dsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-releaseConfig['verifyConfigs']       = {
-    'linux':  'mozEsr24-firefox-linux.cfg',
-    'linux64':  'mozEsr24-firefox-linux64.cfg',
-    'macosx64': 'mozEsr24-firefox-mac64.cfg',
-    'win32':  'mozEsr24-firefox-win32.cfg'
-}
-releaseConfig['mozconfigs']          = {
-    'linux': 'browser/config/mozconfigs/linux32/release',
-    'linux64': 'browser/config/mozconfigs/linux64/release',
-    'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
-    'win32': 'browser/config/mozconfigs/win32/release',
-}
-releaseConfig['releaseChannel']        = 'esr'
-releaseConfig['releaseChannelRuleIds'] = []
-releaseConfig['localTestChannel']      = 'esrtest'
-releaseConfig['cdnTestChannel']        = 'releasetest'
-releaseConfig['testChannelRuleIds']    = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.allizom.org/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
--- a/mozilla/staging_release-firefox-mozilla-esr31.py
+++ b/mozilla/staging_release-firefox-mozilla-esr31.py
@@ -35,17 +35,17 @@ releaseConfig['nextAppVersion']      = '
 releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
 #  Repository configuration, for tagging
 ## Staging repository path
 releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-esr31',
         'clonePath': 'releases/mozilla-esr31',
-        'path': 'users/stage-ffxbld/mozilla-esr24',
+        'path': 'users/stage-ffxbld/mozilla-esr31',
         'revision': 'default',
         'relbranch': None,
         'bumpFiles': {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-esr24.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-releaseConfig['skip_repo_setup']        = True
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer-stage.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
-releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[staging-release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'thunderbird'
-releaseConfig['stage_product']       = 'thunderbird'
-releaseConfig['appName']             = 'mail'
-releaseConfig['mozilla_dir']         = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '9.0'
-releaseConfig['appVersion']          = releaseConfig['version']
-releaseConfig['milestone']           = releaseConfig['version']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_9_0'
-releaseConfig['partialUpdates']      = {
-    '8.0.1': {
-        'buildNumber': 2,
-        'baseTag': '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-esr24',
-        'clonePath': 'releases/comm-esr24',
-        'path': 'users/stage-ffxbld/comm-esr24',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-release',
-        'clonePath': 'releases/mozilla-esr24',
-        'path': 'users/stage-ffxbld/mozilla-esr24',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            '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-esr24'
-#  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': 'production',
-}
-
-# 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']          = 6
-releaseConfig['mergeLocales']        = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozRelease-thunderbird-branch-patcher2.cfg'
-releaseConfig['ftpServer']           = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['stagingServer']       = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausHost']             = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausUser']             = 'tbirdbld'
-releaseConfig['ausSshKey']           = 'tbirdbld_dsa'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-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']    = False
-releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.allizom.org/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = False
-releaseConfig['ftpSymlinkName'] = 'latest'
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-esr24.py.template
+++ /dev/null
@@ -1,157 +0,0 @@
-# ATTENTION:
-# If you are editing the non-template version of this file (eg, doesn't end
-# with .template), your change WILL get overwritten. If you're adding, removing,
-# or changing options as part of release automation changes you should be
-# editing the .template instead. This file should only by edited directly if
-# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-releaseConfig['skip_repo_setup']        = True
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'http://clobberer-stage.pvt.build.mozilla.org/always_clobber.php'
-
-# Release Notification
-releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
-releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
-releaseConfig['releaseTemplates']    = 'release_templates'
-releaseConfig['messagePrefix']       = '[staging-release] '
-
-# Basic product configuration
-#  Names for the product/files
-releaseConfig['productName']         = 'thunderbird'
-releaseConfig['stage_product']       = 'thunderbird'
-releaseConfig['appName']             = 'mail'
-releaseConfig['mozilla_dir']         = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '{{ version }}'
-releaseConfig['appVersion']          = '{{ appVersion }}'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = {{ buildNumber }}
-releaseConfig['baseTag']             = '{{ baseTag }}'
-releaseConfig['partialUpdates']      = {
-{% for version, partial in partials.items() %}
-    '{{ version }}': {
-        'appVersion': '{{ partial['appVersion'] }}',
-        'buildNumber': {{ partial['buildNumber'] }},
-        'baseTag': '{{ partial['baseTag'] }}',
-    },
-{% endfor %}
-}
-#  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-esr24',
-        'clonePath': 'releases/comm-esr24',
-        'path': '{{ branch }}',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'clonePath': 'releases/mozilla-esr24',
-        'path': 'users/stage-ffxbld/mozilla-esr24',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            '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-esr24'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
-    'users/stage-ffxbld/buildbot': 'production-0.8',
-    'users/stage-ffxbld/mozharness': 'production',
-}
-
-# 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']          = 6
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = False
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
-
-# Update-specific configuration
-releaseConfig['patcherConfig']       = 'mozRelease-thunderbird-branch-patcher2.cfg'
-releaseConfig['ftpServer']           = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['stagingServer']       = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausHost']             = 'dev-stage01.srv.releng.scl3.mozilla.com'
-releaseConfig['ausUser']             = 'tbirdbld'
-releaseConfig['ausSshKey']           = 'tbirdbld_dsa'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-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',
-}
-releaseConfig['releaseChannel']      = 'release'
-releaseConfig['localTestChannel']    = 'betatest'
-releaseConfig['cdnTestChannel']      = 'releasetest'
-releaseConfig['testChannelRuleIds']  = []
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-releaseConfig['partnersRepoPath']    = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.allizom.org/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-
-# Misc configuration
-releaseConfig['enable_repo_setup'] = False
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -1032,52 +1032,16 @@ for branch in branches:
             'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib',
         }
     if BRANCHES[branch]['platforms'].has_key('linux64-debug'):
         BRANCHES[branch]['platforms']['linux64-debug']['env']['LD_LIBRARY_PATH'] ='/tools/gcc-4.3.3/installed/lib64:%s/mozilla/dist/bin' % OBJDIR
         BRANCHES[branch]['platforms']['linux64-debug']['unittest-env'] = {
             'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64',
         }
 
-# building 32-bit linux in a x86_64 env rides the trains
-for name, branch in items_before(BRANCHES, 'gecko_version', 24):
-    for platform in ['linux', 'linux-debug']:
-        branch['platforms'][platform]['mock_target'] = \
-            'mozilla-centos6-i386'
-        branch['platforms'][platform]['mock_packages'] = \
-            ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial',
-             'git', 'ccache', 'glibc-static', 'libstdc++-static',
-             'perl-Test-Simple', 'perl-Config-General',
-             'gtk2-devel', 'libnotify-devel', 'yasm',
-             'alsa-lib-devel', 'libcurl-devel',
-             'wireless-tools-devel', 'libX11-devel',
-             'libXt-devel', 'mesa-libGL-devel',
-             'gnome-vfs2-devel', 'GConf2-devel', 'wget',
-             'mpfr', # required for system compiler
-             'xorg-x11-font*', # fonts required for PGO
-             'imake', # required for makedepend!?!
-             'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'yasm', 'ccache', # <-- from releng repo
-             'pulseaudio-libs-devel',
-             'freetype-2.3.11-6.el6_2.9',
-             'freetype-devel-2.3.11-6.el6_2.9',
-            ]
-        if not platform.endswith("-debug"):
-            branch["platforms"][platform]["mock_packages"] += \
-                ["valgrind"]
-
-# gstreamer-devel packages ride the trains (bug 881589)
-for name, branch in items_before(BRANCHES, 'gecko_version', 24):
-    for p, pc in branch['platforms'].items():
-        if 'mock_packages' in pc:
-            branch['platforms'][p]['mock_packages'] = \
-                [x for x in branch['platforms'][p]['mock_packages'] if x not in (
-                    'gstreamer-devel', 'gstreamer-plugins-base-devel',
-                    'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
-                )]
-
 
 if __name__ == "__main__":
     import sys
     import pprint
     args = sys.argv[1:]
 
     if len(args) > 0:
         items = dict([(b, BRANCHES[b]) for b in args])