Bug 1191349 - kill esr31. r=bhearsum
authorJustin Wood <Callek@gmail.com>
Wed, 12 Aug 2015 10:11:31 -0400 (2015-08-12)
changeset 12830 07768ea9341c068b2e02405b383644b2e308a944
parent 12829 88afda24ee116ad3c31317eea469bd85016f7193
child 12831 2720b1d2927f81e18260bc6bfa286461b749b16c
push id9151
push userCallek@gmail.com
push dateWed, 12 Aug 2015 14:12:26 +0000 (2015-08-12)
reviewersbhearsum
bugs1191349
Bug 1191349 - kill esr31. r=bhearsum
mozilla-tests/config.py
mozilla-tests/production_config.py
mozilla-tests/thunderbird_config.py
mozilla-tests/thunderbird_production_config.py
mozilla/build_localconfig.py
mozilla/config.py
mozilla/master_common.py
mozilla/production_config.py
mozilla/release-firefox-mozilla-esr31.py
mozilla/release-firefox-mozilla-esr31.py.template
mozilla/release-thunderbird-comm-esr31.py
mozilla/release-thunderbird-comm-esr31.py.template
mozilla/staging_config.py
mozilla/staging_release-firefox-mozilla-esr31.py
mozilla/staging_release-firefox-mozilla-esr31.py.template
mozilla/staging_release-thunderbird-comm-esr31.py
mozilla/staging_release-thunderbird-comm-esr31.py.template
mozilla/thunderbird_config.py
mozilla/thunderbird_production_config.py
mozilla/thunderbird_staging_config.py
setup-master.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -29,26 +29,16 @@ TALOS_DIRTY_OPTS = {'talosAddOns': ['pro
 
 TALOS_TP_NEW_OPTS = {'plugins': {'32': 'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp5n.zip']}
 
 BRANCHES = {
     'mozilla-central':     {},
     'mozilla-aurora':      {},
     'mozilla-release':     {},
     'mozilla-beta':        {},
-    'mozilla-esr31': {
-        'gecko_version': 31,
-        'platforms': {
-            'macosx64': {},
-            'win32': {},
-            'linux': {},
-            'linux64': {},
-        },
-        'lock_platforms': True,
-    },
     'mozilla-esr38': {
         'gecko_version': 38,
         'platforms': {
             'macosx64': {},
             'win32': {},
             'win64': {},
             'linux': {},
             'linux64': {},
@@ -2078,24 +2068,16 @@ BRANCHES['mozilla-beta']['repo_path'] = 
 BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-beta']['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard', 'yosemite']
 
 ######### mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
 BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-aurora']['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard', 'yosemite']
 
-######### mozilla-esr31
-BRANCHES['mozilla-esr31']['repo_path'] = "releases/mozilla-esr31"
-BRANCHES['mozilla-esr31']['pgo_strategy'] = 'per-checkin'
-BRANCHES['mozilla-esr31']['platforms']['win32']['talos_slave_platforms'] = []
-BRANCHES['mozilla-esr31']['platforms']['macosx64']['talos_slave_platforms'] = []
-BRANCHES['mozilla-esr31']['platforms']['linux']['talos_slave_platforms'] = []
-BRANCHES['mozilla-esr31']['platforms']['linux64']['talos_slave_platforms'] = []
-
 ######### mozilla-esr38
 BRANCHES['mozilla-esr38']['repo_path'] = "releases/mozilla-esr38"
 BRANCHES['mozilla-esr38']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-esr38']['platforms']['win32']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr38']['platforms']['macosx64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr38']['platforms']['linux']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr38']['platforms']['linux64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr38']['platforms']['win32']['talos_slave_platforms'] = []
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -106,20 +106,16 @@ BRANCHES = {
     'mozilla-central': {
         'tinderbox_tree': 'Firefox',
         'mobile_tinderbox_tree': 'Firefox',
     },
     'mozilla-release': {
         'tinderbox_tree': 'Mozilla-Release',
         'mobile_tinderbox_tree': 'Mozilla-Release',
     },
-    'mozilla-esr31': {
-        'tinderbox_tree': 'Mozilla-Esr31',
-        'mobile_tinderbox_tree': 'Mozilla-Esr31',
-    },
     'mozilla-esr38': {
         'tinderbox_tree': 'Mozilla-Esr38',
         'mobile_tinderbox_tree': 'Mozilla-Esr38',
     },
     'mozilla-b2g34_v2_1s': {
         'tinderbox_tree': 'Mozilla-B2g34-v2.1s',
         'mobile_tinderbox_tree': 'Mozilla-B2g34-v2.1s',
     },
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -20,19 +20,16 @@ GLOBAL_VARS.update(thunderbird_localconf
 
 BRANCHES = {
     'comm-central': {
     },
     'comm-beta': {
     },
     'comm-aurora': {
     },
-    'comm-esr31': {
-        'gecko_version': 31
-    },
     'comm-esr38': {
         'gecko_version': 38
     },
     'try-comm-central': {
         'coallesce_jobs': False
     },
 }
 
@@ -362,21 +359,16 @@ BRANCHES['comm-beta']['pgo_strategy'] = 
 BRANCHES['comm-beta']['repo_path'] = "releases/comm-beta"
 BRANCHES['comm-beta']['moz_repo_path'] = "releases/mozilla-beta"
 
 ######## comm-aurora
 BRANCHES['comm-aurora']['pgo_strategy'] = None
 BRANCHES['comm-aurora']['repo_path'] = "releases/comm-aurora"
 BRANCHES['comm-aurora']['moz_repo_path'] = "releases/mozilla-aurora"
 
-######## comm-esr31
-BRANCHES['comm-esr31']['pgo_strategy'] = None
-BRANCHES['comm-esr31']['repo_path'] = "releases/comm-esr31"
-BRANCHES['comm-esr31']['moz_repo_path'] = "releases/mozilla-esr31"
-
 ######## comm-esr38
 BRANCHES['comm-esr38']['pgo_strategy'] = None
 BRANCHES['comm-esr38']['repo_path'] = "releases/comm-esr38"
 BRANCHES['comm-esr38']['moz_repo_path'] = "releases/mozilla-esr38"
 
 ######## try
 BRANCHES['try-comm-central']['enable_try'] = True
 BRANCHES['try-comm-central']['moz_repo_path'] = "mozilla-central"
--- a/mozilla-tests/thunderbird_production_config.py
+++ b/mozilla-tests/thunderbird_production_config.py
@@ -10,19 +10,16 @@ GLOBAL_VARS['disable_tinderbox_mail'] = 
 GLOBAL_VARS['stage_username'] = 'tbirdbld'
 GLOBAL_VARS['stage_ssh_key'] = 'tbirdbld_dsa'
 
 # Local branch overrides
 BRANCHES = {
     'comm-central': {
         'tinderbox_tree': 'Thunderbird',
     },
-    'comm-esr31': {
-        'tinderbox_tree': 'Thunderbird-Esr31',
-    },
     'comm-esr38': {
         'tinderbox_tree': 'Thunderbird-Esr38',
     },
     'comm-beta': {
         'tinderbox_tree': 'Thunderbird-Beta',
     },
     'comm-aurora': {
         'tinderbox_tree': 'Thunderbird-Aurora',
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -26,31 +26,29 @@ if 'limit_branches' in master_config:
     ACTIVE_BRANCHES = [x.encode("utf-8") for x in master_config['limit_branches']]
 else:
     ACTIVE_BRANCHES = ACTIVE_PROJECT_BRANCHES[:]
     ACTIVE_BRANCHES.extend([
         'mozilla-central',
         'mozilla-beta',
         'mozilla-aurora',
         'mozilla-release',
-        'mozilla-esr31',
         'mozilla-esr38',
         'mozilla-b2g34_v2_1s',
         'mozilla-b2g37_v2_2',
         'mozilla-b2g37_v2_2r',
     ])
 if 'limit_tb_branches' in master_config:
     ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
 else:
     ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
     ACTIVE_THUNDERBIRD_BRANCHES.extend([
         'comm-central',
         'comm-beta',
         'comm-aurora',
-        'comm-esr31',
         'comm-esr38',
     ])
 if 'limit_b2g_branches' in master_config:
     ACTIVE_B2G_BRANCHES = [x.encode("utf-8") for x in master_config['limit_b2g_branches']]
 else:
     ACTIVE_B2G_BRANCHES = ACTIVE_B2G_PROJECT_BRANCHES[:]
     ACTIVE_B2G_BRANCHES.extend([
         'mozilla-central',
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2268,32 +2268,16 @@ BRANCHES = {
         'merge_builds': False,
     },
     'mozilla-beta': {
         'merge_builds': False,
     },
     'mozilla-aurora': {
         'merge_builds': False,
     },
-    'mozilla-esr31': {
-        'merge_builds': False,
-        'branch_projects': [],
-        'lock_platforms': True,
-        'gecko_version': 31,
-        'platforms': {
-            'linux': {},
-            'linux64': {},
-            'win32': {},
-            'macosx64': {},
-            'linux-debug': {},
-            'linux64-debug': {},
-            'macosx64-debug': {},
-            'win32-debug': {},
-        },
-    },
     'mozilla-esr38': {
         'merge_builds': False,
         'lock_platforms': True,
         'gecko_version': 38,
         'platforms': {
             'linux': {},
             'linux64': {},
             'macosx64': {},
@@ -2634,44 +2618,16 @@ BRANCHES['mozilla-aurora']['platforms'][
 BRANCHES['mozilla-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['win64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
 BRANCHES['mozilla-aurora']['enabled_products'] = ['firefox', 'mobile']
 
-######## mozilla-esr31
-BRANCHES['mozilla-esr31']['repo_path'] = 'releases/mozilla-esr31'
-BRANCHES['mozilla-esr31']['update_channel'] = 'nightly-esr31'
-BRANCHES['mozilla-esr31']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
-BRANCHES['mozilla-esr31']['enable_weekly_bundle'] = True
-BRANCHES['mozilla-esr31']['start_hour'] = [0]
-BRANCHES['mozilla-esr31']['start_minute'] = [5]
-BRANCHES['mozilla-esr31']['pgo_strategy'] = 'per-checkin'
-BRANCHES['mozilla-esr31']['enable_mac_a11y'] = True
-BRANCHES['mozilla-esr31']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-esr31']['enable_l10n'] = False
-BRANCHES['mozilla-esr31']['enable_l10n_onchange'] = False
-BRANCHES['mozilla-esr31']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-esr31']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                               'macosx64']
-BRANCHES['mozilla-esr31']['l10nDatedDirs'] = True
-BRANCHES['mozilla-esr31']['l10n_tree'] = 'fxesr31'
-BRANCHES['mozilla-esr31']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-esr31'
-BRANCHES['mozilla-esr31']['enable_nightly'] = False
-BRANCHES['mozilla-esr31']['updates_enabled'] = False
-BRANCHES['mozilla-esr31']['create_partial'] = False
-BRANCHES['mozilla-esr31']['enable_blocklist_update'] = True
-BRANCHES['mozilla-esr31']['enable_hsts_update'] = True
-BRANCHES['mozilla-esr31']['enable_valgrind'] = False
-BRANCHES['mozilla-esr31']['enabled_products'] = ['firefox']
-
 ######## mozilla-esr38
 BRANCHES['mozilla-esr38']['repo_path'] = 'releases/mozilla-esr38'
 BRANCHES['mozilla-esr38']['update_channel'] = 'nightly-esr38'
 BRANCHES['mozilla-esr38']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['mozilla-esr38']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-esr38']['start_hour'] = [0]
 BRANCHES['mozilla-esr38']['start_minute'] = [15]
 BRANCHES['mozilla-esr38']['pgo_strategy'] = 'per-checkin'
@@ -2989,17 +2945,17 @@ mc_gecko_version = BRANCHES['mozilla-cen
 for name, branch in items_before(BRANCHES, 'gecko_version', mc_gecko_version):
     if 'linux64-st-an-debug' in branch['platforms']:
         del branch['platforms']['linux64-st-an-debug']
     if 'macosx64-st-an-debug' in branch['platforms']:
         del branch['platforms']['macosx64-st-an-debug']
 
 # Only test pretty names on train branches, not m-c or project branches.
 for branch in ("mozilla-aurora", "mozilla-beta", "mozilla-release",
-               "mozilla-esr31", "mozilla-esr38"):
+               "mozilla-esr38"):
     for platform in ("linux", "linux64", "macosx64", "win32", "win64"):
         if platform in BRANCHES[branch]['platforms']:
             BRANCHES[branch]['platforms'][platform]['test_pretty_names'] = True
 
 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
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -19,19 +19,17 @@ c['builders'] = []
 c['schedulers'] = []
 c['change_source'] = []
 
 # Builders from these branches are given custom priority, default is 4 for unlisted branches
 # Please leave in sorted order
 DEFAULT_BRANCH_PRIORITY = 4
 BRANCH_PRIORITIES = {
     'mozilla-release': 0,
-    'comm-esr31': 0,
     'comm-esr38': 0,
-    'mozilla-esr31': 1,
     'mozilla-esr38': 1,
     'mozilla-beta': 2,
     'comm-beta': 2,
     'mozilla-central': 3,
     'comm-central': 3,
     'mozilla-aurora': 3,
     'comm-aurora': 3,
     # Unlisted branches are prioritized at this level
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -78,21 +78,16 @@ BRANCHES = {
         'mobile_tinderbox_tree': 'Mobile',
         'mobile_build_failure_emails': ['<mobile-build-failures@mozilla.org>'],
     },
     'mozilla-release': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-Release',
         'tinderbox_tree': 'Mozilla-Release',
         'mobile_tinderbox_tree': 'Mozilla-Release',
     },
-    'mozilla-esr31': {
-        'packaged_unittest_tinderbox_tree': 'Mozilla-Esr31',
-        'tinderbox_tree': 'Mozilla-Esr31',
-        'mobile_tinderbox_tree': 'Mozilla-Esr31',
-    },
     'mozilla-esr38': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-Esr38',
         'tinderbox_tree': 'Mozilla-Esr38',
         'mobile_tinderbox_tree': 'Mozilla-Esr38',
     },
     'mozilla-b2g34_v2_1s': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-B2g34-v2.1s',
         'tinderbox_tree': 'Mozilla-B2g34-v2.1s',
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr31.py
+++ /dev/null
@@ -1,166 +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'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release-automation-notifications@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']             = '31.8.0esr'
-releaseConfig['appVersion']          = '31.8.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'FIREFOX_31_8_0esr'
-releaseConfig['partialUpdates']      = {
-
-    '31.6.0esr': {
-        'appVersion': '31.6.0',
-        'buildNumber': 2,
-        'baseTag': 'FIREFOX_31_6_0esr',
-    },
-
-    '31.5.3esr': {
-        'appVersion': '31.5.3',
-        'buildNumber': 1,
-        'baseTag': 'FIREFOX_31_5_3esr',
-    },
-
-    '31.7.0esr': {
-        'appVersion': '31.7.0',
-        'buildNumber': 2,
-        'baseTag': 'FIREFOX_31_7_0esr',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '31.8.0esrpre'
-releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'releases/mozilla-esr31',
-        'revision': '7707a37fe477',
-        'relbranch': None,
-        'bumpFiles': {
-            'browser/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            '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-esr31'
-#  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['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = False
-
-# 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_rsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['ausHost']             = None
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_rsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = None
-releaseConfig['useBetaChannel']      = 1
-releaseConfig['updateVerifyChunks']  = 6
-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['updateChannels'] = {
-    "esr": {
-        "versionRegex": r"^.*$",
-        "ruleId": 34,
-        "patcherConfig": "mozEsr31-branch-patcher2.cfg",
-        "localTestChannel": "esr-localtest",
-        "cdnTestChannel": "esr-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-firefox-linux.cfg",
-            "linux64":  "mozEsr31-firefox-linux64.cfg",
-            "macosx64": "mozEsr31-firefox-mac64.cfg",
-            "win32":  "mozEsr31-firefox-win32.cfg",
-        },
-        "testChannels": {
-            "esr-localtest": {
-                "ruleId": 58,
-            },
-            "esr-cdntest": {
-                "ruleId": 59,
-            },
-        },
-    },
-}
-
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://ffxbld@svn.mozilla.org/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://ffxbld@svn.mozilla.org/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/ffxbld_rsa"
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31.0esr'
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr31.py.template
+++ /dev/null
@@ -1,153 +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'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release-automation-notifications@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': {
-        'name': 'mozilla-esr31',
-        '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']
-            },
-        }
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mozilla-esr31'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_0_9_5',
-    'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = ()
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = False
-
-# 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_rsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['ausHost']             = None
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_rsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-releaseConfig['useBetaChannel']      = 1
-releaseConfig['updateVerifyChunks']  = 6
-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['updateChannels'] = {
-    "esr": {
-        "versionRegex": r"^.*$",
-        "ruleId": 34,
-        "patcherConfig": "mozEsr31-branch-patcher2.cfg",
-        "localTestChannel": "esr-localtest",
-        "cdnTestChannel": "esr-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-firefox-linux.cfg",
-            "linux64":  "mozEsr31-firefox-linux64.cfg",
-            "macosx64": "mozEsr31-firefox-mac64.cfg",
-            "win32":  "mozEsr31-firefox-win32.cfg",
-        },
-        "testChannels": {
-            "esr-localtest": {
-                "ruleId": 58,
-            },
-            "esr-cdntest": {
-                "ruleId": 59,
-            },
-        },
-    },
-}
-
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://ffxbld@svn.mozilla.org/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://ffxbld@svn.mozilla.org/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/ffxbld_rsa"
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31.0esr'
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-esr31.py
+++ /dev/null
@@ -1,173 +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'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release-automation-notifications@mozilla.com>', '<thunderbird-drivers@mozilla.org>']
-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']             = '31.8.0'
-releaseConfig['appVersion']          = '31.8.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_31_8_0'
-releaseConfig['partialUpdates']      = {
-
-    '31.6.0': {
-        'appVersion': '31.6.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_31_6_0',
-    },
-
-    '31.7.0': {
-        'appVersion': '31.7.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_31_7_0',
-    },
-
-    '31.5.0': {
-        'appVersion': '31.5.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_31_5_0',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr31',
-        'path': 'releases/comm-esr31',
-        'revision': '77b4e8312015',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'releases/mozilla-esr31',
-        'revision': 'e4bb794b360e',
-        'relbranch': None,
-        'bumpFiles': {
-            '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-esr31'
-#  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']     = False
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'tbirdbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/tbirdbld_dsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['ausHost']             = None
-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['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['source_mozconfig']      = 'mail/config/mozconfigs/linux64/release'
-releaseConfig['releaseChannel']        = 'release'
-releaseConfig['updateChannels'] = {
-    "release": {
-        "versionRegex": r"^.*$",
-        "ruleId": 35,
-        "patcherConfig": "mozEsr31-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "release-localtest",
-        "cdnTestChannel": "release-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-thunderbird-linux.cfg",
-            "linux64":  "mozEsr31-thunderbird-linux64.cfg",
-            "macosx64": "mozEsr31-thunderbird-mac64.cfg",
-            "win32":  "mozEsr31-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "release-localtest": {
-                "ruleId": 61,
-            },
-            "release-cdntest": {
-                "ruleId": 62,
-            },
-        },
-    },
-}
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://tbirdbld@svn.mozilla.org/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://tbirdbld@svn.mozilla.org/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/ffxbld_rsa"
-
-# Misc configuration
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31'
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-esr31.py.template
+++ /dev/null
@@ -1,160 +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'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients']       = ['<release-automation-notifications-thunderbird@mozilla.org>',]
-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']      = {
-{% 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
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr31',
-        'path': 'releases/comm-esr31',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'releases/mozilla-esr31',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            '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-esr31'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'build/compare-locales': 'RELEASE_AUTOMATION',
-    'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = ()
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = False
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'tbirdbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/tbirdbld_dsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer']           = 'ftp.mozilla.org'
-releaseConfig['stagingServer']       = 'stage.mozilla.org'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['ausHost']             = None
-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['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['source_mozconfig']      = 'mail/config/mozconfigs/linux64/release'
-releaseConfig['releaseChannel']        = 'release'
-releaseConfig['updateChannels'] = {
-    "release": {
-        "versionRegex": r"^.*$",
-        "ruleId": 35,
-        "patcherConfig": "mozEsr31-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "release-localtest",
-        "cdnTestChannel": "release-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-thunderbird-linux.cfg",
-            "linux64":  "mozEsr31-thunderbird-linux64.cfg",
-            "macosx64": "mozEsr31-thunderbird-mac64.cfg",
-            "win32":  "mozEsr31-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "release-localtest": {
-                "ruleId": 61,
-            },
-            "release-cdntest": {
-                "ruleId": 62,
-            },
-        },
-    },
-}
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://tbirdbld@svn.mozilla.org/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://tbirdbld@svn.mozilla.org/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/ffxbld_rsa"
-
-# Misc configuration
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31'
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -78,22 +78,16 @@ BRANCHES = {
         'file_update_on_closed_tree': False,
     },
     'mozilla-aurora': {
         'enable_blocklist_update': False,
         'enable_hsts_update': False,
         'enable_hpkp_update': False,
         'file_update_on_closed_tree': False,
     },
-    'mozilla-esr31': {
-        'enable_blocklist_update': False,
-        'enable_hsts_update': False,
-        'enable_hpkp_update': False,
-        'file_update_on_closed_tree': False,
-    },
     'mozilla-esr38': {
         'enable_blocklist_update': False,
         'enable_hsts_update': False,
         'enable_hpkp_update': False,
         'file_update_on_closed_tree': False,
     },
     'mozilla-b2g34_v2_1s': {
         'enable_blocklist_update': False,
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr31.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.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-releaseConfig['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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']             = '31.0esr'
-releaseConfig['appVersion']          = '31.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'FIREFOX_31_0esr'
-releaseConfig['partialUpdates']      = {
-    '31.3.0esr': {
-        'appVersion': '31.3.0',
-        'buildNumber': 2,
-        'baseTag': 'FIREFOX_31_3_0esr',
-    },
-        '24.8.1esr': {
-        'appVersion': '24.8.1',
-        'buildNumber': 1,
-        'baseTag': 'FIREFOX_24_8_1esr',
-    },
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '{{ version }}pre'
-releaseConfig['nextMilestone']       = releaseConfig['nextAppVersion']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'users/stage-ffxbld/mozilla-esr31',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            'browser/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            'config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
-        }
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mozilla-esr31'
-#  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_rsa'
-
-# Update-specific configuration
-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_rsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['releaseChannel']      = 'esr'
-releaseConfig['updateChannels'] = {
-    "esr": {
-        "versionRegex": r"^.*$",
-        "ruleId": 53,
-        "patcherConfig": "mozEsr31-branch-patcher2.cfg",
-        "localTestChannel": "esr-localtest",
-        "cdnTestChannel": "esr-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-firefox-linux.cfg",
-            "linux64":  "mozEsr31-firefox-linux64.cfg",
-            "macosx64": "mozEsr31-firefox-mac64.cfg",
-            "win32":  "mozEsr31-firefox-win32.cfg",
-        },
-        "testChannels": {
-            "beta-cdntest": {
-                "ruleId": 42,
-            },
-            "beta-localtest": {
-                "ruleId": 29,
-            },
-        }
-    }
-}
-
-# 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['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31.0esr'
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr31.py.template
+++ /dev/null
@@ -1,153 +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['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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
-releaseConfig['sourceRepositories']  = {
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        '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']
-            },
-        }
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mozilla-esr31'
-#  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['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = False
-
-# 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_rsa'
-
-# Update-specific configuration
-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']        = 'https://aus4-dev.allizom.org'
-releaseConfig['ausHost']             = None
-releaseConfig['ausUser']             = 'ffxbld'
-releaseConfig['ausSshKey']           = 'ffxbld_rsa'
-releaseConfig['releaseNotesUrl']     = None
-releaseConfig['testOlderPartials']   = False
-releaseConfig['promptWaitTime']      = {{ promptWaitTime }}
-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['updateChannels'] = {
-    "esr": {
-        "versionRegex": r"^.*$",
-        "ruleId": 53,
-        "patcherConfig": "mozEsr31-branch-patcher2.cfg",
-        "localTestChannel": "esr-localtest",
-        "cdnTestChannel": "esr-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-firefox-linux.cfg",
-            "linux64":  "mozEsr31-firefox-linux64.cfg",
-            "macosx64": "mozEsr31-firefox-mac64.cfg",
-            "win32":  "mozEsr31-firefox-win32.cfg",
-        },
-        "testChannels": {
-            "esr-cdntest": {
-                "ruleId": 42,
-            },
-            "esr-localtest": {
-                "ruleId": 29,
-            },
-        }
-    }
-}
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://ffxbld@dev-stage01.srv.releng.scl3.mozilla.com/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://ffxbld@dev-stage01.srv.releng.scl3.mozilla.com/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/ffxbld_rsa"
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31.0esr'
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-esr31.py
+++ /dev/null
@@ -1,159 +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['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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']             = '31.1.1'
-releaseConfig['appVersion']          = '31.1.1'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_31_1_1'
-releaseConfig['partialUpdates']      = {
-
-    '31.1.0': {
-        'appVersion': '31.1.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_31_1_0',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr31',
-        'path': 'users/stage-ffxbld/comm-esr31',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'users/stage-ffxbld/mozilla-esr31',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            'config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
-        },
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr31'
-#  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
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '/home/mock_mozilla/.ssh/ffxbld_rsa'
-
-# Update-specific configuration
-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']      = None
-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['updateChannels'] = {
-    "release": {
-        "versionRegex": r"^.*$",
-        "ruleId": 45,
-        "patcherConfig": "mozEsr31-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "release-localtest",
-        "cdnTestChannel": "release-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-thunderbird-linux.cfg",
-            "linux64":  "mozEsr31-thunderbird-linux64.cfg",
-            "macosx64": "mozEsr31-thunderbird-mac64.cfg",
-            "win32":  "mozEsr31-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "release-localtest": {
-                "ruleId": 44,
-            },
-            "release-cdntest": {
-                "ruleId": 22,
-            },
-        },
-    },
-}
-
-# 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['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31'
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-esr31.py.template
+++ /dev/null
@@ -1,163 +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['disable_tinderbox_mail'] = True
-releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-esr31',
-        'path': '{{ branch }}',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-esr31',
-        'path': 'users/stage-ffxbld/mozilla-esr31',
-        'revision': '{{ mozillaRevision }}',
-        'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
-        },
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr31'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
-    'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['talosTestPlatforms']  = ()
-releaseConfig['xulrunnerPlatforms']  = ()
-
-# Unittests
-releaseConfig['unittestPlatforms']   = ()
-releaseConfig['enableUnittests']     = False
-
-# L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath']  = 'mail/locales/shipped-locales'
-releaseConfig['l10nChunks']          = 6
-releaseConfig['mergeLocales']        = True
-releaseConfig['l10nUsePymake']       = True
-
-# Mercurial account
-releaseConfig['hgUsername']          = 'stage-ffxbld'
-releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_rsa'
-
-# Update-specific configuration
-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']        = 'https://aus4-dev.allizom.org'
-releaseConfig['ausHost']             = None
-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['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['source_mozconfig']      = 'mail/config/mozconfigs/linux64/release'
-releaseConfig['releaseChannel']        = 'release'
-releaseConfig['updateChannels'] = {
-    "release": {
-        "versionRegex": r"^.*$",
-        "ruleId": 45,
-        "patcherConfig": "mozEsr31-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "release-localtest",
-        "cdnTestChannel": "release-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozEsr31-thunderbird-linux.cfg",
-            "linux64":  "mozEsr31-thunderbird-linux64.cfg",
-            "macosx64": "mozEsr31-thunderbird-mac64.cfg",
-            "win32":  "mozEsr31-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "release-localtest": {
-                "ruleId": 44,
-            },
-            "release-cdntest": {
-                "ruleId": 22,
-            },
-        },
-    },
-}
-
-# 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'
-
-# Product details config
-releaseConfig["productDetailsRepo"] = "svn+ssh://tbirdbld@dev-stage01.srv.releng.scl3.mozilla.com/libs/product-details"
-releaseConfig["mozillaComRepo"]     = "svn+ssh://tbirdbld@dev-stage01.srv.releng.scl3.mozilla.com/projects/mozilla.com"
-releaseConfig["svnSshKey"]          = "/home/cltbld/.ssh/tbirdbld_dsa"
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-31'
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -632,19 +632,16 @@ for platform in PLATFORM_VARS.values():
 # platforms (if different from the default set).
 BRANCHES = {
     'comm-central': {
     },
     'comm-aurora': {
     },
     'comm-beta': {
     },
-    'comm-esr31': {
-        'gecko_version': 31,
-    },
     'comm-esr38': {
         'gecko_version': 38,
     },
     'try-comm-central': {
     },
 }
 
 # Copy project branches into BRANCHES keys
@@ -770,50 +767,16 @@ BRANCHES['comm-central']['create_partial
 BRANCHES['comm-central']['create_partial_l10n'] = True
 BRANCHES['comm-central']['enable_blocklist_update'] = True
 BRANCHES['comm-central']['file_update_on_closed_tree'] = False
 BRANCHES['comm-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
 
-######## comm-esr31
-BRANCHES['comm-esr31']['repo_path'] = 'releases/comm-esr31'
-BRANCHES['comm-esr31']['moz_repo_path'] = 'releases/mozilla-esr31'
-BRANCHES['comm-esr31']['mozilla_dir'] = 'mozilla'
-BRANCHES['comm-esr31']['update_channel'] = 'nightly-esr31'
-BRANCHES['comm-esr31']['skip_blank_repos'] = True
-BRANCHES['comm-esr31']['call_client_py'] = True
-BRANCHES['comm-esr31']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
-BRANCHES['comm-esr31']['enable_weekly_bundle'] = True
-BRANCHES['comm-esr31']['start_hour'] = [3]
-BRANCHES['comm-esr31']['start_minute'] = [2]
-BRANCHES['comm-esr31']['enable_xulrunner'] = False
-# Enable unit tests
-BRANCHES['comm-esr31']['enable_mac_a11y'] = True
-BRANCHES['comm-esr31']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['comm-esr31']['enable_l10n'] = False
-BRANCHES['comm-esr31']['enable_l10n_onchange'] = False
-BRANCHES['comm-esr31']['l10nNightlyUpdate'] = False
-BRANCHES['comm-esr31']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                            'macosx64']
-BRANCHES['comm-esr31']['l10nDatedDirs'] = True
-BRANCHES['comm-esr31']['l10n_tree'] = 'tbrel'
-BRANCHES['comm-esr31']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr31'
-BRANCHES['comm-esr31']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr31' % (GLOBAL_VARS['hgurl'])
-BRANCHES['comm-esr31']['enable_nightly'] = False
-BRANCHES['comm-esr31']['updates_enabled'] = False
-BRANCHES['comm-esr31']['create_partial'] = False
-BRANCHES['comm-esr31']['enable_blocklist_update'] = False
-BRANCHES['comm-esr31']['file_update_on_closed_tree'] = False
-BRANCHES['comm-esr31']['enable_valgrind'] = False
-
 ######## comm-esr38
 BRANCHES['comm-esr38']['repo_path'] = 'releases/comm-esr38'
 BRANCHES['comm-esr38']['moz_repo_path'] = 'releases/mozilla-esr38'
 BRANCHES['comm-esr38']['update_channel'] = 'nightly-esr38'
 BRANCHES['comm-esr38']['skip_blank_repos'] = True
 BRANCHES['comm-esr38']['call_client_py'] = True
 BRANCHES['comm-esr38']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['comm-esr38']['enable_weekly_bundle'] = True
--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -39,20 +39,16 @@ GLOBAL_VARS['l10n_tinderbox_tree'] = 'Mo
 GLOBAL_VARS['base_bundle_urls'] = ['https://ftp-ssl.mozilla.org/pub/mozilla.org/thunderbird/bundles']
 
 # Local branch overrides
 BRANCHES = {
     'comm-central': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird',
         'tinderbox_tree': 'Thunderbird',
     },
-    'comm-esr31': {
-        'packaged_unittest_tinderbox_tree': 'Thunderbird-Esr31',
-        'tinderbox_tree': 'Thunderbird-Esr31',
-    },
     'comm-esr38': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird-Esr38',
         'tinderbox_tree': 'Thunderbird-Esr38',
     },
     'comm-beta': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird-Beta',
         'tinderbox_tree': 'Thunderbird-Beta',
     },
--- a/mozilla/thunderbird_staging_config.py
+++ b/mozilla/thunderbird_staging_config.py
@@ -39,20 +39,16 @@ BRANCHES = {
     'comm-beta': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'comm-aurora': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
-    'comm-esr31': {
-        'enable_blocklist_update': False,
-        'file_update_on_closed_tree': False,
-    },
     'comm-esr38': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'try-comm-central': {
         'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
         'enable_mail_notifier': False, # Set to True when testing
         'email_override': [], # Set to your address when testing
--- a/setup-master.py
+++ b/setup-master.py
@@ -236,25 +236,25 @@ def load_masters_json(masters_json, role
             c.globs.append('l10n-changesets*')
             c.globs.append('release_templates')
             if m['environment'] == 'staging':
                 c.globs.append('staging_release-*-*.py')
                 # release-*.py -> staging_release-*.py symlinks
                 c.local_links.extend(
                     [('staging_release-firefox-mozilla-%s.py' % v,
                       'release-firefox-mozilla-%s.py' % v)
-                     for v in ['beta', 'release', 'esr31', 'esr38']
+                     for v in ['beta', 'release', 'esr38']
                      ] +
                     [('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', 'esr31', 'esr38']
+                        for v in ['beta', 'esr38']
                      ]
                 )
             else:
                 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')