Bug 1465641: Disable unused branches in buildbot r=nthomas,tomprince
authorChris AtLee <catlee@mozilla.com>
Thu, 31 May 2018 10:32:26 -0400
changeset 15773 b89147016685eaf603b18f9a71cfdacb77bc77db
parent 15772 d78ea27fd5fbe184bee61898f698959b8df9939f
child 15774 93ec12d38da84a5168e9f1d9e7437a0acddfb82c
child 15778 b87a988a67ff3fa5a642603a12c983f4338c6a30
push id11069
push usercatlee@mozilla.com
push dateFri, 01 Jun 2018 14:20:09 +0000
reviewersnthomas, tomprince
bugs1465641
Bug 1465641: Disable unused branches in buildbot r=nthomas,tomprince Differential Revision: https://phabricator.services.mozilla.com/D1476
mozilla-tests/config.py
mozilla-tests/production_config.py
mozilla/build_localconfig.py
mozilla/config.py
mozilla/production_config.py
mozilla/project_branches.py
mozilla/staging_config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -21,19 +21,16 @@ MOZHARNESS_REBOOT_CMD = ['scripts/extern
                          '-f', '../reboot_count.txt',
                          '-n', '1', '-z']
 
 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-release':     {},
-    'mozilla-beta':        {},
     'mozilla-esr52': {
         'gecko_version': 52,
         'platforms': {
             'macosx64': {},
             'win32': {},
             'win64': {},
             'linux': {},
             'linux64': {},
@@ -2717,35 +2714,16 @@ for k, v in localconfig.PROJECTS.iterite
 
 # Let's load the defaults
 for branch in BRANCHES.keys():
     loadDefaultValues(BRANCHES, branch, BRANCHES[branch])
     loadCustomTalosSuites(BRANCHES, SUITES, branch, BRANCHES[branch])
 
 # The following are exceptions to the defaults
 
-######## mozilla-central
-BRANCHES['mozilla-central']['branch_name'] = "Firefox"
-BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
-BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
-BRANCHES['mozilla-central']['pgo_strategy'] = 'periodic'
-
-######### mozilla-release
-BRANCHES['mozilla-release']['repo_path'] = "releases/mozilla-release"
-BRANCHES['mozilla-release']['pgo_strategy'] = 'per-checkin'
-BRANCHES['mozilla-release']['platforms']['win32']['talos_slave_platforms'] = []
-BRANCHES['mozilla-release']['platforms']['macosx64']['talos_slave_platforms'] = []
-BRANCHES['mozilla-release']['platforms']['linux']['talos_slave_platforms'] = []
-BRANCHES['mozilla-release']['platforms']['linux64']['talos_slave_platforms'] = []
-BRANCHES['mozilla-release']['platforms']['win64']['talos_slave_platforms'] = []
-
-######### mozilla-beta
-BRANCHES['mozilla-beta']['repo_path'] = "releases/mozilla-beta"
-BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
-
 ######### mozilla-esr52
 BRANCHES['mozilla-esr52']['repo_path'] = "releases/mozilla-esr52"
 BRANCHES['mozilla-esr52']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-esr52']['platforms']['win32']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr52']['platforms']['macosx64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr52']['platforms']['linux']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr52']['platforms']['linux64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-esr52']['platforms']['win32']['talos_slave_platforms'] = []
@@ -2753,23 +2731,16 @@ BRANCHES['mozilla-esr52']['platforms']['
 
 
 ######## try
 BRANCHES['try']['repo_path'] = "try"
 BRANCHES['try']['pgo_strategy'] = 'try'
 BRANCHES['try']['enable_try'] = True
 BRANCHES['try']['watch_all_branches'] = True
 
-######### jamun
-BRANCHES['jamun']['platforms']['win32']['talos_slave_platforms'] = []
-BRANCHES['jamun']['platforms']['macosx64']['talos_slave_platforms'] = []
-BRANCHES['jamun']['platforms']['linux']['talos_slave_platforms'] = []
-BRANCHES['jamun']['platforms']['linux64']['talos_slave_platforms'] = []
-BRANCHES['jamun']['platforms']['win64']['talos_slave_platforms'] = []
-
 ### Tests Enabled In Gecko 39+ ###
 
 # mochitest-jetpack everywhere
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
     for pf in PLATFORMS:
         if pf not in branch['platforms']:
             continue
         for slave_pf in branch['platforms'][pf].get(
@@ -3443,64 +3414,16 @@ for branch in BRANCHES.keys():
 
 #limit tests on Win10 asan to m-c and try
 for branch in BRANCHES.keys():
     if branch in ['mozilla-central', 'try']:
         continue
     if 'win64-asan' in BRANCHES[branch]['platforms'].keys():
         del BRANCHES[branch]['platforms']['win64-asan']
 
-# Ash-specific branch config. Please add any new buildbot test scheduling changes above this block.
-for platform in PLATFORMS.keys():
-    if platform not in BRANCHES['ash']['platforms']:
-        continue
-
-    base_tests = CRASHTEST_E10S + JSREFTEST_E10S_TWO_CHUNKS + MARIONETTE_E10S + MOCHITEST_BC_7_E10S + \
-                 MOCHITEST_CLIPBOARD_E10S + MOCHITEST_E10S + MOCHITEST_GPU_E10S + MOCHITEST_MEDIA_E10S + \
-                 MOCHITEST_WEBGL_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S
-
-    for slave_platform in PLATFORMS[platform]['slave_platforms']:
-        if slave_platform not in BRANCHES['ash']['platforms'][platform]:
-            continue
-
-        # Linux jobs are scheduled via in-tree Taskcluster configs, so no need for anything here.
-        if slave_platform == "yosemite_r7":
-            BRANCHES['ash']['platforms'][platform][slave_platform]['debug_unittest_suites'] = \
-                base_tests + MOCHITEST_DT_8_E10S + REFTEST_E10S_TWO_CHUNKS + WEB_PLATFORM_TESTS_CHUNKED_MORE_E10S
-            BRANCHES['ash']['platforms'][platform][slave_platform]['opt_unittest_suites'] = \
-                base_tests + MOCHITEST_DT_8_E10S + REFTEST_E10S + WEB_PLATFORM_TESTS_CHUNKED_E10S
-        if slave_platform == "win8_64":
-            BRANCHES['ash']['platforms'][platform][slave_platform]['debug_unittest_suites'] = \
-                base_tests + MOCHITEST_DT_8_E10S + REFTEST_E10S_TWO_CHUNKS + REFTEST_NOACCEL_E10S_TWO_CHUNKS +\
-                    WEB_PLATFORM_TESTS_CHUNKED_MORE_E10S
-            BRANCHES['ash']['platforms'][platform][slave_platform]['opt_unittest_suites'] = \
-                base_tests + MOCHITEST_DT_8_E10S + REFTEST_E10S + REFTEST_NOACCEL_E10S +\
-                    WEB_PLATFORM_TESTS_CHUNKED_E10S
-        if slave_platform == "win7_ix":
-            BRANCHES['ash']['platforms'][platform][slave_platform]['debug_unittest_suites'] = \
-                MOCHITEST_CLIPBOARD_E10S + MOCHITEST_MEDIA_E10S
-            BRANCHES['ash']['platforms'][platform][slave_platform]['opt_unittest_suites'] = \
-                MOCHITEST_CLIPBOARD_E10S + MOCHITEST_MEDIA_E10S
-        if slave_platform == "win7_vm":
-            BRANCHES['ash']['platforms'][platform][slave_platform]['debug_unittest_suites'] = \
-                CRASHTEST_E10S + JSREFTEST_E10S_TWO_CHUNKS + MARIONETTE_E10S + MOCHITEST_BC_7_E10S + \
-                MOCHITEST_DT_8_E10S + MOCHITEST_E10S + WEB_PLATFORM_REFTESTS_E10S + \
-                WEB_PLATFORM_TESTS_CHUNKED_MORE_E10S
-            BRANCHES['ash']['platforms'][platform][slave_platform]['opt_unittest_suites'] = \
-                CRASHTEST_E10S + JSREFTEST_E10S_TWO_CHUNKS + MARIONETTE_E10S + MOCHITEST_BC_7_E10S + \
-                MOCHITEST_DT_8_E10S + MOCHITEST_E10S + WEB_PLATFORM_REFTESTS_E10S + \
-                WEB_PLATFORM_TESTS_CHUNKED_E10S
-        if slave_platform == "win7_vm_gfx":
-            BRANCHES['ash']['platforms'][platform][slave_platform]['debug_unittest_suites'] = \
-                MOCHITEST_GPU_E10S + MOCHITEST_WEBGL_CHUNKED_E10S + REFTEST_E10S_TWO_CHUNKS + \
-                    REFTEST_GPU_E10S + REFTEST_NOACCEL_E10S_TWO_CHUNKS
-            BRANCHES['ash']['platforms'][platform][slave_platform]['opt_unittest_suites'] = \
-                MOCHITEST_GPU_E10S + MOCHITEST_WEBGL_CHUNKED_E10S + REFTEST_E10S + \
-                    REFTEST_FOUR_CHUNKS + REFTEST_GPU_E10S + REFTEST_NOACCEL_E10S + \
-                    REFTEST_NOACCEL_FOUR_CHUNKS
 # Bug 1370298 - Disable BB windows tests that are green in TC
 WIN_TC_56_NONGREEN_DEBUG_SUITES = ('reftest-gpu-e10s', 'mochitest-clipboard', 'mochitest-clipboard-e10s', 'mochitest-chrome', 'xpcshell')
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 56):
     for platform in ('win32', 'win32-devedition'):
         if platform not in branch['platforms']:
             continue
         for slave_platform in ['win7_vm', 'win7_vm_gfx']:
             if slave_platform not in branch['platforms'][platform]:
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -99,53 +99,27 @@ GLOBAL_VARS = {
     'mozharness_repo': 'https://hg.mozilla.org/build/mozharness',
     'mozharness_tag': 'production',
     'blob_upload': True,
 }
 
 
 # Local branch overrides
 BRANCHES = {
-    'mozilla-central': {
-        'tinderbox_tree': 'Firefox',
-        'mobile_tinderbox_tree': 'Firefox',
-    },
-    'mozilla-release': {
-        'tinderbox_tree': 'Mozilla-Release',
-        'mobile_tinderbox_tree': 'Mozilla-Release',
-    },
     'mozilla-esr52': {
         'tinderbox_tree': 'Mozilla-Esr52',
         'mobile_tinderbox_tree': 'Mozilla-Esr52',
     },
-    'mozilla-beta': {
-        'tinderbox_tree': 'Mozilla-Beta',
-        'mobile_tinderbox_tree': 'Mozilla-Beta',
-    },
-    'addontester': {
-        'tinderbox_tree': 'AddonTester',
-        'mobile_tinderbox_tree': 'AddonTester',
-    },
-    'addonbaselinetester': {
-        'tinderbox_tree': 'AddonTester',
-        'mobile_tinderbox_tree': 'AddonTester',
-    },
     'try': {
         'tinderbox_tree': 'Try',
         'mobile_tinderbox_tree': 'Try',
         'enable_mail_notifier': True,
         'notify_real_author': True,
         'enable_merging': False,
         'slave_key': 'try_slaves',
         'package_url': 'https://archive.mozilla.org/pub/firefox/try-builds',
         'package_dir': '%(who)s-%(got_revision)s/',
     },
 }
 
-PLATFORM_VARS = {
-}
+PLATFORM_VARS = {}
 
-PROJECTS = {
-    'jetpack': {
-        'scripts_repo': 'https://hg.mozilla.org/build/tools',
-        'tinderbox_tree': 'Jetpack',
-    },
-}
+PROJECTS = {}
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -21,19 +21,16 @@ if 'ssh_port' in master_config:
 
 from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES, BRANCH_PROJECTS
 from thunderbird_config import ACTIVE_PROJECT_BRANCHES as ACTIVE_THUNDERBIRD_PROJECT_BRANCHES
 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-release',
         'mozilla-esr52',
     ])
 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',
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -5,17 +5,17 @@ reload(project_branches)
 from project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
 
 import localconfig
 reload(localconfig)
 from localconfig import SLAVES, TRY_SLAVES
 
 import master_common
 reload(master_common)
-from master_common import setMainFirefoxVersions, items_before, items_at_least
+from master_common import setMainFirefoxVersions, items_before, items_at_least, get_gecko_version
 
 GLOBAL_VARS = {
     # It's a little unfortunate to have both of these but some things (HgPoller)
     # require an URL while other things (BuildSteps) require only the host.
     # Since they're both right here it shouldn't be
     # a problem to keep them in sync.
     'hgurl': 'https://hg.mozilla.org/',
     'hghost': 'hg.mozilla.org',
@@ -1732,19 +1732,16 @@ PLATFORM_VARS["macosx64-lion-debug"]["sl
 
 for platform in PLATFORM_VARS.values():
     if 'env' not in platform:
         platform['env'] = deepcopy(GLOBAL_ENV)
     else:
         platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
 
 PROJECTS = {
-    'fuzzing': {
-        'platforms': ['mock', 'macosx64-lion', 'win64-rev2'],
-    },
 }
 
 # Override config settings with local settings
 def apply_localconfig(config, local):
     for k, v in local.items():
         if k not in config:
             config[k] = {}
         config[k].update(v)
@@ -1808,25 +1805,16 @@ BRANCH_PROJECTS = {
     }
 }
 
 apply_localconfig(BRANCH_PROJECTS, localconfig.BRANCH_PROJECTS)
 
 # All branches (not in project_branches) that are to be built MUST be listed here, along with their
 # platforms (if different from the default set).
 BRANCHES = {
-    'mozilla-central': {
-        'merge_builds': False,
-    },
-    'mozilla-release': {
-        'merge_builds': False,
-    },
-    'mozilla-beta': {
-        'merge_builds': False,
-    },
     'mozilla-esr52': {
         'merge_builds': False,
         'lock_platforms': True,
         'gecko_version': 52,
         'platforms': {
             'linux': {},
             'linux64': {},
             'macosx64': {},
@@ -1941,490 +1929,16 @@ for branch in BRANCHES.keys():
     # Check for project branch removing a platform from default platforms
     if branch in ACTIVE_PROJECT_BRANCHES:
         for key, value in PROJECT_BRANCHES[branch].items():
             if key in ('platforms', 'mobile_platforms'):
                 for platform, platform_config in value.items():
                     if platform_config.get('dont_build'):
                         del BRANCHES[branch]['platforms'][platform]
 
-######## mozilla-central
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['mozilla-central']['repo_path'] = 'mozilla-central'
-BRANCHES['mozilla-central']['l10n_repo_path'] = 'l10n-central'
-BRANCHES['mozilla-central']['enable_perproduct_builds'] = True
-BRANCHES['mozilla-central']['start_hour'] = [3]
-BRANCHES['mozilla-central']['start_minute'] = [2]
-# Enable PGO Builds on this branch
-BRANCHES['mozilla-central']['pgo_strategy'] = 'periodic'
-BRANCHES['mozilla-central']['periodic_start_hours'] = range(1, 24, 3)
-BRANCHES['mozilla-central']['periodic_start_minute'] = 30
-# Enable unit tests
-BRANCHES['mozilla-central']['enable_mac_a11y'] = True
-BRANCHES['mozilla-central']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-central']['enable_l10n'] = True
-BRANCHES['mozilla-central']['l10nNightlyUpdate'] = True
-BRANCHES['mozilla-central']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64', 'win64']
-BRANCHES['mozilla-central']['l10nDatedDirs'] = True
-BRANCHES['mozilla-central']['l10n_tree'] = 'fxcentral'
-# make sure it has an ending slash
-BRANCHES['mozilla-central']['l10nUploadPath'] = \
-    '/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/'
-BRANCHES['mozilla-central']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-central'
-BRANCHES['mozilla-central']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.mozilla-central' % (GLOBAL_VARS['hgurl'])
-BRANCHES['mozilla-central']['enable_multi_locale'] = True
-BRANCHES['mozilla-central']['upload_mobile_symbols'] = True
-# Enable desktop repacks with mozharness
-BRANCHES['mozilla-central']['desktop_mozharness_repacks_enabled'] = True
-
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['mozilla-central']['updates_enabled'] = True
-BRANCHES['mozilla-central']['update_channel'] = 'nightly'
-BRANCHES['mozilla-central']['create_partial'] = True
-BRANCHES['mozilla-central']['create_partial_l10n'] = True
-BRANCHES['mozilla-central']['enable_blocklist_update'] = True
-BRANCHES['mozilla-central']['enable_hsts_update'] = True
-BRANCHES['mozilla-central']['enable_hpkp_update'] = True
-BRANCHES['mozilla-central']['platforms']['android-x86']['updates_enabled'] = True
-BRANCHES['mozilla-central']['platforms']['android-api-15']['updates_enabled'] = True
-BRANCHES['mozilla-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['win64']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['android-api-15']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
-
-######## mozilla-release
-BRANCHES['mozilla-release']['repo_path'] = 'releases/mozilla-release'
-BRANCHES['mozilla-release']['update_channel'] = 'release'
-BRANCHES['mozilla-release']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
-BRANCHES['mozilla-release']['start_hour'] = [3]
-BRANCHES['mozilla-release']['start_minute'] = [2]
-# Enable PGO Builds on this branch
-BRANCHES['mozilla-release']['pgo_strategy'] = 'per-checkin'
-# Enable unit tests
-BRANCHES['mozilla-release']['enable_mac_a11y'] = True
-# L10n configuration
-BRANCHES['mozilla-release']['enable_l10n'] = False
-BRANCHES['mozilla-release']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-release']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                                 'macosx64']
-BRANCHES['mozilla-release']['l10nDatedDirs'] = True
-BRANCHES['mozilla-release']['l10n_tree'] = 'fxrel'
-BRANCHES['mozilla-release']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-release'
-BRANCHES['mozilla-release']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.mozilla-release' % (GLOBAL_VARS['hgurl'])
-BRANCHES['mozilla-release']['enable_multi_locale'] = True
-BRANCHES['mozilla-release']['upload_mobile_symbols'] = True
-# temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
-BRANCHES['mozilla-release']['enable_nightly'] = False
-BRANCHES['mozilla-release']['enable_blocklist_update'] = True
-BRANCHES['mozilla-release']['enabled_products'] = ['firefox', 'mobile']
-BRANCHES['mozilla-release']['enable_perproduct_builds'] = False
-### Release Promotion
-BRANCHES['mozilla-release']['enable_release_promotion'] = {
-    "firefox": True,
-    "fennec": True,
-}
-# used by process/release.py
-BRANCHES['mozilla-release']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
-BRANCHES['mozilla-release']['single_locale_branch_config'] = {
-    "firefox": "mozilla-release",
-}
-BRANCHES['mozilla-release']['bouncer_submitter_config'] = {
-    "firefox": "releases/bouncer_firefox_release.py",
-    "fennec": 'releases/bouncer_fennec.py',
-}
-BRANCHES['mozilla-release']['uptake_monitoring_config'] = {
-    "firefox": 'releases/bouncer_firefox_release.py',
-    "fennec": 'releases/bouncer_fennec.py',
-}
-BRANCHES['mozilla-release']['postrelease_version_bump_config'] = {
-    "firefox": 'releases/postrelease_firefox_release.py',
-    # configs are generic so can be reused
-    "fennec": 'releases/postrelease_firefox_release.py',
-}
-BRANCHES['mozilla-release']['postrelease_bouncer_aliases_config'] = {
-    "firefox": 'releases/bouncer_firefox_release.py',
-    "fennec": 'releases/bouncer_fennec.py',
-}
-BRANCHES['mozilla-release']['postrelease_mark_as_shipped_config'] = {
-    "firefox": 'releases/postrelease_firefox_release.py',
-    # configs are generic so can be reused
-    "fennec": 'releases/postrelease_firefox_release.py',
-}
-BRANCHES['mozilla-release']['updates_config'] = {
-    "firefox": 'releases/updates_firefox_release.py',
-    # TODO - fennec
-    "fennec": "",
-}
-BRANCHES['mozilla-release']['beetmover_credentials'] = "/builds/release-s3.credentials"
-BRANCHES['mozilla-release']['stage_product'] = {
-    'firefox': 'firefox',
-    'fennec': 'mobile'
-}
-BRANCHES['mozilla-release']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-release']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-release']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-release']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-release']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
-# used by releasetasks
-BRANCHES['mozilla-release']['bouncer_enabled'] = True
-BRANCHES['mozilla-release']['postrelease_version_bump_enabled'] = {
-    "firefox": True,
-    "fennec": True,
-}
-BRANCHES['mozilla-release']['postrelease_bouncer_aliases_enabled'] = True
-BRANCHES['mozilla-release']['postrelease_mark_as_shipped_enabled'] = True
-BRANCHES['mozilla-release']['uptake_monitoring_enabled'] = True
-BRANCHES['mozilla-release']['push_to_candidates_enabled'] = True
-BRANCHES['mozilla-release']['push_to_releases_automatic'] = False
-BRANCHES['mozilla-release']['beetmover_buckets'] = {
-    "firefox": "net-mozaws-prod-delivery-firefox",
-    "fennec": "net-mozaws-prod-delivery-archive",
-}
-BRANCHES['mozilla-release']['uptake_monitoring_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-    "fennec": ("android-api-15", "android-x86"),
-}
-BRANCHES['mozilla-release']['signing_class'] = {
-    "firefox": "release-signing",
-    "fennec": "release-signing",
-}
-BRANCHES['mozilla-release']['signing_cert'] = {
-    "firefox": "release",
-    "fennec": "release",
-}
-BRANCHES['mozilla-release']['root_home_dir'] = {
-    "firefox": "desktop",
-    "fennec": "mobile",
-}
-BRANCHES['mozilla-release']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-release']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-release']['partner_repacks_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
-}
-BRANCHES['mozilla-release']['eme_free_repacks_platforms'] = {
-    "firefox": ("win32", "win64", "macosx64")
-}
-BRANCHES['mozilla-release']['partner_repack_config'] = {
-    "firefox": {
-        "script_name": "scripts/desktop_partner_repacks.py",
-        "extra_args": [
-            "--cfg", "partner_repacks/release_mozilla-release_desktop.py",
-            "--s3cfg", "/builds/partners-s3cfg",
-        ],
-    },
-    # TODO - add fennec support
-    # 'fennec': {}
-}
-BRANCHES['mozilla-release']['updates_builder_enabled'] = True
-BRANCHES['mozilla-release']['update_verify_enabled'] = True
-BRANCHES['mozilla-release']['mirror_requiring_channels'] = ['release']
-BRANCHES['mozilla-release']['release_channel_mappings'] = {
-  "firefox": [
-        [r"^\d+\.0$", ["beta", "release"]],  # RC, 45.0
-        [r"^\d+\.\d+\.\d+$", ["release"]],  # Other (dot releaseas), 45.0.4
-    ]
-}
-# Bug 1313434, CI builds on all named branches
-BRANCHES['mozilla-release']['watch_all_branches'] = True
-# platform to TC index mapping to help finding prmotable CI builds
-BRANCHES['mozilla-release']['tc_indexes'] = {
-    "firefox": {
-        "linux": {
-            "unsigned": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.linux-opt",
-            "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.linux-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "linux64": {
-            "unsigned": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.linux64-opt",
-            "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.linux64-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "macosx64": {
-            "unsigned": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.macosx64-opt",
-            "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.macosx64-opt.en-US",
-            "repackage": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.macosx64-nightly-repackage",
-            "repackage-signing": "gecko.v2.mozilla-release.nightly.revision.{rev}.firefox.macosx64-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "win32": {
-            "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win32-opt.en-US",
-            "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.win32-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "win64": {
-            "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win64-opt.en-US",
-            "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.win64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-    },
-    # TODO: fennec
-}
-# Recompress complete MARs from LZMA to BZ2 for updates from versions < 56.0. We did this until 57.0.4.
-BRANCHES['mozilla-release']['lzma_to_bz2'] = False
-
-######## mozilla-beta
-BRANCHES['mozilla-beta']['repo_path'] = 'releases/mozilla-beta'
-BRANCHES['mozilla-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
-BRANCHES['mozilla-beta']['update_channel'] = 'beta'
-BRANCHES['mozilla-beta']['start_hour'] = [3]
-BRANCHES['mozilla-beta']['start_minute'] = [2]
-# Enable PGO Builds on this branch
-BRANCHES['mozilla-beta']['pgo_strategy'] = 'per-checkin'
-# Enable unit tests
-BRANCHES['mozilla-beta']['enable_mac_a11y'] = True
-BRANCHES['mozilla-beta']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-beta']['enable_l10n'] = False
-BRANCHES['mozilla-beta']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-beta']['l10n_platforms'] = ['linux', 'linux64', 'win32',
-                                              'macosx64']
-BRANCHES['mozilla-beta']['l10nDatedDirs'] = True
-BRANCHES['mozilla-beta']['l10n_tree'] = 'fxbeta'
-#make sure it has an ending slash
-BRANCHES['mozilla-beta']['l10nUploadPath'] = \
-    '/home/ftp/pub/mozilla.org/firefox/nightly/latest-mozilla-beta-l10n/'
-BRANCHES['mozilla-beta']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-beta'
-BRANCHES['mozilla-beta']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.mozilla-beta' % (GLOBAL_VARS['hgurl'])
-BRANCHES['mozilla-beta']['enable_multi_locale'] = True
-BRANCHES['mozilla-beta']['upload_mobile_symbols'] = True
-# temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
-BRANCHES['mozilla-beta']['enable_nightly'] = False
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['mozilla-beta']['enable_blocklist_update'] = True
-BRANCHES['mozilla-beta']['platforms']['android-api-15']['enable_dep'] = True
-BRANCHES['mozilla-beta']['platforms']['android-api-15-debug']['enable_dep'] = True
-BRANCHES['mozilla-beta']['enabled_products'] = ['firefox', 'mobile', 'devedition']
-BRANCHES['mozilla-beta']['enable_perproduct_builds'] = False
-### Release Promotion
-# enables/disables BB builders
-BRANCHES['mozilla-beta']['enable_release_promotion'] = {
-    "firefox": True,
-    "fennec": True,
-    "devedition": True,
-}
-# used by process/release.py
-BRANCHES['mozilla-beta']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
-BRANCHES['mozilla-beta']['single_locale_branch_config'] = {
-    "firefox": "mozilla-beta",
-    "devedition": "mozilla-beta_devedition",
-}
-BRANCHES['mozilla-beta']['bouncer_submitter_config'] = {
-    "firefox": "releases/bouncer_firefox_beta.py",
-    "devedition": "releases/bouncer_firefox_devedition.py",
-    "fennec": 'releases/bouncer_fennec_beta.py',
-}
-BRANCHES['mozilla-beta']['uptake_monitoring_config'] = {
-    "firefox": 'releases/bouncer_firefox_beta.py',
-    "devedition": "releases/bouncer_firefox_devedition.py",
-    "fennec": 'releases/bouncer_fennec_beta.py',
-}
-BRANCHES['mozilla-beta']['postrelease_version_bump_config'] = {
-    # configs are generic so can be reused
-    "firefox": 'releases/postrelease_firefox_beta.py',
-    "fennec": 'releases/postrelease_firefox_beta.py',
-    "devedition": 'releases/postrelease_firefox_beta.py',
-}
-BRANCHES['mozilla-beta']['postrelease_bouncer_aliases_config'] = {
-    "firefox": 'releases/bouncer_firefox_beta.py',
-    "devedition": "releases/bouncer_firefox_devedition.py",
-    "fennec": 'releases/bouncer_fennec_beta.py',
-}
-BRANCHES['mozilla-beta']['postrelease_mark_as_shipped_config'] = {
-    "firefox": 'releases/postrelease_firefox_beta.py',
-    # configs are generic so can be reused
-    "fennec": 'releases/postrelease_firefox_beta.py',
-    "devedition": "releases/postrelease_firefox_beta.py",
-}
-BRANCHES['mozilla-beta']['updates_config'] = {
-    "firefox": 'releases/updates_firefox_beta.py',
-    "devedition": 'releases/updates_firefox_devedition.py',
-    # TODO - fennec
-    "fennec": "",
-}
-BRANCHES['mozilla-beta']['beetmover_credentials'] = "/builds/release-s3.credentials"
-BRANCHES['mozilla-beta']['stage_product'] = {
-    'firefox': 'firefox',
-    'fennec': 'mobile',
-    'devedition': 'devedition'
-}
-BRANCHES['mozilla-beta']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-beta']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-beta']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-beta']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-beta']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
-BRANCHES['mozilla-beta']['platforms']['macosx64-devedition']['dep_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-beta']['platforms']['win32-devedition']['dep_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-beta']['platforms']['win64-devedition']['dep_signing_servers'] = 'nightly-signing'
-# used by releasetasks
-BRANCHES['mozilla-beta']['binary_transparency_enabled'] = False
-BRANCHES['mozilla-beta']['bouncer_enabled'] = True
-BRANCHES['mozilla-beta']['updates_builder_enabled'] = True
-BRANCHES['mozilla-beta']['update_verify_enabled'] = True
-BRANCHES['mozilla-beta']['postrelease_version_bump_enabled'] = {
-    "firefox": True,
-    "devedition": True,
-    "fennec": True,
-}
-BRANCHES['mozilla-beta']['postrelease_bouncer_aliases_enabled'] = True
-BRANCHES['mozilla-beta']['postrelease_mark_as_shipped_enabled'] = True
-BRANCHES['mozilla-beta']['uptake_monitoring_enabled'] = True
-BRANCHES['mozilla-beta']['push_to_candidates_enabled'] = True
-BRANCHES['mozilla-beta']['push_to_releases_automatic'] = True
-BRANCHES['mozilla-beta']['release_channel_mappings'] = {
-    "firefox": [["^.*$", ["beta"]]],
-    "devedition": [["^.*$", ["aurora"]]],
-}
-BRANCHES['mozilla-beta']['beetmover_buckets'] = {
-    "firefox": "net-mozaws-prod-delivery-firefox",
-    "fennec": "net-mozaws-prod-delivery-archive",
-    "devedition": "net-mozaws-prod-delivery-archive",
-}
-BRANCHES['mozilla-beta']['uptake_monitoring_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-    "fennec": ("android-api-15", "android-x86"),
-    "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
-}
-BRANCHES['mozilla-beta']['signing_class'] = {
-    "firefox": "release-signing",
-    "fennec": "release-signing",
-    "devedition": "nightly-signing",
-}
-BRANCHES['mozilla-beta']['signing_cert'] = {
-    "firefox": "release",
-    "fennec": "release",
-    "devedition": "nightly",
-}
-BRANCHES['mozilla-beta']['accepted_mar_channel_id'] = {
-    "firefox": "firefox-mozilla-beta",
-    "devedition": "firefox-mozilla-aurora",
-    # TODO: fennec
-}
-BRANCHES['mozilla-beta']['root_home_dir'] = {
-    "firefox": "desktop",
-    "devedition": "desktop",
-    "fennec": "mobile",
-}
-BRANCHES['mozilla-beta']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-beta']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-beta']['partner_repacks_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
-}
-BRANCHES['mozilla-beta']['eme_free_repacks_platforms'] = {
-    "firefox": ("win32", "win64", "macosx64")
-}
-BRANCHES['mozilla-beta']['partner_repack_config'] = {
-    "firefox": {
-        "script_name": "scripts/desktop_partner_repacks.py",
-        "extra_args": [
-            "--cfg", "partner_repacks/release_mozilla-release_desktop.py",
-            "--s3cfg", "/builds/partners-s3cfg",
-        ],
-    },
-    # TODO - add fennec support
-    # 'fennec': {}
-}
-BRANCHES['mozilla-beta']['snap_enabled'] = {"firefox": True}
-BRANCHES['mozilla-beta']['update_verify_channel'] = {
-    "firefox": 'beta-cdntest',
-    "devedition": 'aurora-cdntest',
-}
-BRANCHES['mozilla-beta']['update_verify_requires_cdn_push'] = True
-# platform to TC index mapping to help finding prmotable CI builds
-BRANCHES['mozilla-beta']['tc_indexes'] = {
-    "firefox": {
-        "linux": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.linux-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.linux-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "linux64": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.linux64-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.linux64-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "macosx64": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.macosx64-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.macosx64-opt.en-US",
-            "repackage": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.macosx64-nightly-repackage",
-            "repackage-signing": "gecko.v2.mozilla-beta.nightly.revision.{rev}.firefox.macosx64-nightly-repackage-signing",
-            "ci_system": "tc",
-        },
-        "win32": {
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win32-opt.en-US",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.win32-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "win64": {
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win64-opt.en-US",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.win64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-    },
-    "devedition": {
-        "linux": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.devedition.linux-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.linux-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.linux-devedition-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "linux64": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.devedition.linux64-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.linux64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.linux64-devedition-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "macosx64": {
-            "unsigned": "gecko.v2.mozilla-beta.nightly.revision.{rev}.devedition.macosx64-opt",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.macosx64-opt.en-US",
-            "repackage": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "win32": {
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win32-opt.en-US",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.win32-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win32-devedition-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-        "win64": {
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win64-opt.en-US",
-            "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.win64-opt.en-US",
-            "repackage-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win64-devedition-nightly-repackage-signing.en-US",
-            "ci_system": "tc",
-        },
-    },
-    # TODO: fennec
-}
-# Recompress complete MARs from LZMA to BZ2 for versions >= 56.0
-BRANCHES['mozilla-beta']['lzma_to_bz2'] = False
-
 ######## mozilla-esr52
 BRANCHES['mozilla-esr52']['repo_path'] = 'releases/mozilla-esr52'
 BRANCHES['mozilla-esr52']['update_channel'] = 'esr'
 BRANCHES['mozilla-esr52']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['mozilla-esr52']['start_hour'] = [0]
 BRANCHES['mozilla-esr52']['start_minute'] = [15]
 BRANCHES['mozilla-esr52']['pgo_strategy'] = 'per-checkin'
 BRANCHES['mozilla-esr52']['enable_mac_a11y'] = True
@@ -2689,37 +2203,37 @@ for name, branch in BRANCHES.items():
     for plat, pc in branch['platforms'].items():
         if 'mock_packages' in pc and "android" in plat:
             pc['mock_packages'] = \
                 [x for x in pc['mock_packages'] if x not in (
                     'ant', 'ant-apache-regexp',
                 )]
 
 # Only test pretty names on train branches, not m-c or project branches.
-for branch in ("mozilla-beta", "mozilla-release", "mozilla-esr52"):
+for branch in ("mozilla-esr52",):
     for platform in ("linux", "linux64", "macosx64", "win32", "win64"):
         if platform in BRANCHES[branch]['platforms']:
             BRANCHES[branch]['platforms'][platform]['test_pretty_names'] = True
 
 # enable mozharness desktop builds on 45.0 and higher
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 45):
     # if true, any platform with mozharness_desktop_build in its config
     # will use mozharness instead of MozillaBuildFactory
     branch['desktop_mozharness_builds_enabled'] = True
 
 # enable mozharness mobile builds on m-a, m-c, and m-c related branches
-mc_gecko_version = BRANCHES['mozilla-central']['gecko_version']
+mc_gecko_version = get_gecko_version('mozilla-central')
 for name, branch in items_before(BRANCHES, 'gecko_version', mc_gecko_version):
     for platform in branch['platforms'].keys():
         if 'android' in platform:
             # we don't want to disable the branch level item: "desktop_mozharness_builds_enabled"
             # we do want to remove the platform level item: "mozharness_desktop_build"
             del branch['platforms'][platform]['mozharness_desktop_build']
 
-##Bug 1268542 - Disable Linux64 Debug builds and tests in buildbot
+# Bug 1268542 - Disable Linux64 Debug builds and tests in buildbot
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 48):
     for platform in branch['platforms'].keys():
         if platform not in ['linux64-debug']:
             continue
         del branch['platforms'][platform]
 
 # Bug 1282849 - disable fennec debug builds and tests in buildbot
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 50):
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -72,60 +72,36 @@ GLOBAL_VARS = {
     'bucket_prefix': 'net-mozaws-prod-delivery',
 }
 
 BUILDS_BEFORE_REBOOT = 1
 SYMBOL_SERVER_HOST = 'symbolpush.mozilla.org'
 
 # Local branch overrides
 BRANCHES = {
-    'mozilla-central': {
-        'tinderbox_tree': 'Firefox',
-        'mobile_tinderbox_tree': 'Mobile',
-        'mobile_build_failure_emails': ['<mobile-build-failures@mozilla.org>'],
-    },
-    'mozilla-release': {
-        'tinderbox_tree': 'Mozilla-Release',
-        'mobile_tinderbox_tree': 'Mozilla-Release',
-    },
     'mozilla-esr52': {
         'tinderbox_tree': 'Mozilla-Esr52',
         'mobile_tinderbox_tree': 'Mozilla-Esr52',
     },
-    'mozilla-beta': {
-        'tinderbox_tree': 'Mozilla-Beta',
-        'mobile_tinderbox_tree': 'Mozilla-Beta',
-    },
     'try': {
         'tinderbox_tree': 'Try',
         'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net',
         'mobile_tinderbox_tree': 'Try',
         'download_base_url': 'https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/try-builds',
         'mobile_download_base_url': 'https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/try-builds',
         'enable_mail_notifier': True,
         'notify_real_author': True,
         'package_url': 'https://archive.mozilla.org/pub/firefox/try-builds',
         'talos_masters': [],
     },
 }
 
 PLATFORM_VARS = {}
 
 PROJECTS = {
-    'fuzzing': {
-        'scripts_repo': 'https://hg.mozilla.org/build/tools',
-        'lithium_repo': 'https://github.com/MozillaSecurity/lithium.git',
-        'funfuzz_repo': 'https://github.com/MozillaSecurity/funfuzz.git',
-        'fuzzmanager_repo': 'https://github.com/MozillaSecurity/FuzzManager.git',
-        'fuzzing_remote_host': 'ffxbld@pvtbuilds2.dmz.scl3.mozilla.com',
-        # Path needs extra leading slash due to optparse expansion on Win32
-        'fuzzing_base_dir': '//mnt/pvt_builds/fuzzing/',
-        # This is # of idle slaves per master
-        'idle_slaves': 2,
-    },
 }
 
 BRANCH_PROJECTS = {
     'spidermonkey_tier_1': {
         'scripts_repo': 'https://hg.mozilla.org/build/tools',
         'idle_slaves': 0,
     }
 }
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -1,814 +1,10 @@
 # noinspection PyInterpreter
 PROJECT_BRANCHES = {
-    ### PLEASE ADD NEW BRANCHES ALPHABETICALLY (twigs at the bottom, also alphabetically)
-    # 'build-system': {},  # Bug 1010674
-    #'fx-team': {},  #bug 1296396
-    'mozilla-inbound': {
-        'merge_builds': False,
-        'repo_path': 'integration/mozilla-inbound',
-        'enable_perproduct_builds': True,
-        'mozconfig_dir': 'mozilla-central',
-        'pgo_strategy': 'periodic',
-        'periodic_start_hours': range(0, 24, 3),
-        'talos_suites': {
-            'xperf': 1,
-        },
-        'branch_projects': [],
-    },
-    #'services-central': {},  # Bug 1010674
-    # 'alder': {},
-    # Bug 1252292 - Schedule e10s tests on Ash for all desktop platforms
-    'ash': {
-        'enable_talos': False,
-        'lock_platforms': True,
-        'merge_builds': False,
-        'periodic_start_hours': [9, 21],
-        'pgo_strategy': 'periodic',
-        'platforms': {
-            'linux': {
-                'slave_platforms': ['ubuntu32_vm'],
-            },
-            'linux64': {
-                'slave_platforms': ['ubuntu64_vm'],
-            },
-            'linux64-asan': {
-                'slave_platforms': ['ubuntu64-asan_vm'],
-            },
-            'linux64-debug': {
-                'slave_platforms': ['ubuntu64_vm'],
-            },
-            'macosx64': {
-                'slave_platforms': ['yosemite_r7'],
-            },
-            'macosx64-debug': {
-                'slave_platforms': ['yosemite_r7'],
-            },
-            'win32': {},
-            'win32-debug': {},
-            'win64': {},
-            'win64-debug': {},
-        },
-    },
-    'autoland': {
-        'merge_builds': False,
-        'repo_path': 'integration/autoland',
-        'enable_perproduct_builds': True,
-        'mozconfig_dir': 'mozilla-central',
-        'pgo_strategy': 'periodic',
-        'periodic_start_hours': range(0, 24, 3),
-        'talos_suites': {
-            'xperf': 1,
-        },
-        'branch_projects': [],
-    },
-    'birch': {
-        'gecko_version': 58,
-        'watch_all_branches': True,
-        'desktop_mozharness_builds_enable': True,
-        'use_mozharness_repo_cache': False,
-        'branch_projects': [],
-        'enable_opt_unittests': False,
-        'enable_debug_unittests': False,
-        'enable_talos': True,
-        'platforms': {
-            'linux': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'linux64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win32': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'macosx64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-        },
-        'pgo_strategy': 'per-checkin',
-        'enable_release_promotion': {
-            "firefox": True,
-            "fennec": True,
-        },
-        'build_tools_repo_path': 'users/bhearsum_mozilla.com/tools',
-        "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "single_locale_branch_config": {
-            "firefox": "dev-mozilla-release",
-        },
-        "partner_repacks_platforms": {
-            "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
-        },
-        "eme_free_repacks_platforms": {
-            "firefox": ("win32", "win64", "macosx64")
-        },
-        "partner_repack_config": {
-            "firefox": {
-                "script_name": "scripts/desktop_partner_repacks.py",
-                "extra_args": [
-                    "--cfg", "partner_repacks/release_mozilla-release_desktop.py",
-                    "--s3cfg", "NO_UPLOADS_IN_STAGING",
-                ],
-            },
-        },
-        'release_channel_mappings': {
-            "firefox": [
-                [r"^\d+\.0$", ["beta", "release"]],  # RC, 45.0
-                [r"^\d+\.\d+\.\d+$", ["release"]],  # Other (dot releaseas), 45.0.4
-            ]
-        },
-        'uptake_monitoring_platforms': {
-            "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-            "fennec": ("android-api-16", "android-x86"),
-        },
-        # temp balrog
-        'balrog_api_root': 'http://54.90.211.22:8080/api',
-        'funsize_balrog_api_root': 'http://54.90.211.22:8080/api',
-        'tuxedoServerUrl': 'https://admin-bouncer-releng.stage.mozaws.net/api',
-        'bouncer_submitter_config': {
-            "firefox": "releases/bouncer_firefox_release.py",
-            "fennec": "releases/bouncer_fennec_release.py",
-        },
-        'binary_transparency_enabled': True,
-        'bouncer_enabled': True,
-        'updates_builder_enabled': True,
-        'update_verify_enabled': True,
-        'postrelease_version_bump_enabled': {
-            "firefox": True,
-            "fennec": True,
-        },
-        'postrelease_version_bump_config': {
-            "firefox": 'releases/dev_postrelease_firefox_release_birch.py',
-            "fennec": 'releases/dev_postrelease_fennec_release.py',
-        },
-        'uptake_monitoring_enabled': True,
-        'uptake_monitoring_config': {
-            "firefox": 'releases/bouncer_firefox_release.py',
-            "fennec": "releases/bouncer_fennec_release.py",
-        },
-        'postrelease_bouncer_aliases_enabled': True,
-        'postrelease_bouncer_aliases_config': {
-            "firefox": 'releases/bouncer_firefox_release.py',
-            "fennec": "releases/bouncer_fennec_release.py",
-        },
-        'postrelease_mark_as_shipped_enabled': True,
-        'postrelease_mark_as_shipped_config': {
-            "firefox": 'releases/dev_postrelease_firefox_release_birch.py',
-            "fennec": 'releases/dev_postrelease_fennec_release.py',
-        },
-        'push_to_candidates_enabled': True,
-        'updates_config': {
-            "firefox": 'releases/dev_updates_firefox_release_birch.py',
-            "fennec": "",
-        },
-        'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
-        'beetmover_buckets': {
-            'firefox': 'net-mozaws-stage-delivery-firefox',
-            'fennec': 'net-mozaws-stage-delivery-archive',
-        },
-        'stage_product': {
-            'firefox': 'firefox',
-            'fennec': 'mobile',
-        },
-        'signing_class': {
-            "firefox": "release-signing",
-            "fennec": "dep-signing",
-        },
-        'signing_cert': {
-            "firefox": "release",
-            "fennec": "depend",
-        },
-        'moz_disable_mar_cert_verification': False,
-        'root_home_dir': {
-            "firefox": "desktop",
-            "fennec": "mobile",
-        },
-        'enabled_products': ['firefox', 'mobile'],
-        'push_to_releases_automatic': False,
-        'merge_builds': False,
-        'snap_enabled': {"firefox": True},
-        'update_verify_channel': {
-            'firefox': 'release-localtest',
-        },
-        'tc_indexes': {
-            "firefox": {
-                "linux": {
-                    "unsigned": "gecko.v2.birch.nightly.revision.{rev}.firefox.linux-opt",
-                    "signed": "gecko.v2.birch.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
-                    "repackage-signing": "gecko.v2.birch.nightly.revision.{rev}.firefox.linux-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "linux64": {
-                    "unsigned": "gecko.v2.birch.nightly.revision.{rev}.firefox.linux64-opt",
-                    "signed": "gecko.v2.birch.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
-                    "repackage-signing": "gecko.v2.birch.nightly.revision.{rev}.firefox.linux64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "macosx64": {
-                    "unsigned": "gecko.v2.birch.nightly.revision.{rev}.firefox.macosx64-opt",
-                    "signed": "gecko.v2.birch.signed-nightly.revision.{rev}.firefox-l10n.macosx64-opt.en-US",
-                    "repackage": "gecko.v2.birch.nightly.revision.{rev}.firefox.macosx64-nightly-repackage",
-                    "repackage-signing": "gecko.v2.birch.nightly.revision.{rev}.firefox.macosx64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "win32": {
-                    "unsigned": "gecko.v2.birch.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "signed": "gecko.v2.birch.signed-nightly.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "repackage-signing": "gecko.v2.birch.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win64": {
-                    "unsigned": "gecko.v2.birch.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "signed": "gecko.v2.birch.signed-nightly.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "repackage-signing": "gecko.v2.birch.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-            },
-            # TODO: fennec
-        },
-        'lzma_to_bz2': False,
-    },
-# Bug 1308544 - Enable automation jobs on Cedar twig
-    'cedar': {
-        'enable_perproduct_builds': False,
-        'lock_platforms': True,
-        'mozharness_tag': 'default',
-        'enable_talos': True,
-        'talos_suites': {
-            'other': 1,
-            'svgr': 1,
-            'tp5o': 1,
-            'other-e10s': 1,
-            'svgr-e10s': 1,
-            'tp5o-e10s': 1,
-        },
-        'enable_opt_unittests': True,
-        'platforms': {
-            'linux64': {},
-            'linux64-debug': {},
-            'macosx64': {},
-            'macosx64-debug': {},
-            'win32': {},
-            'win32-debug': {},
-            'win64': {},
-            'win64-debug': {},
-        },
-    },
-    # Disabled by bug 1363047
-    # 'cypress': {},
-    'maple': {
-        'gecko_version': 58,
-        'watch_all_branches': True,
-        'desktop_mozharness_builds_enabled': True,
-        'use_mozharness_repo_cache': False,
-        'branch_projects': [],
-        ## TODO - enabled tests.
-        # note - to enable tests you must also remove:
-        # platforms[platform]["slave_platforms"] item override below
-        'enable_opt_unittests': False,
-        'enable_debug_unittests': False,
-        'enable_talos': True,
-        'platforms': {
-            'linux': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'linux64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win32': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'macosx64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win32-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'win64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'macosx64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'linux64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-        },
-        'pgo_strategy': 'per-checkin',
-        'enable_release_promotion': {
-            "firefox": True,
-            "devedition": True,
-            "fennec": True,
-        },
-        'build_tools_repo_path': 'users/asasaki_mozilla.com/tools',
-        "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "single_locale_branch_config": {
-            "firefox": "dev-mozilla-beta",
-            "devedition": "dev-mozilla-beta_devedition",
-        },
-        "partner_repacks_platforms": {
-            "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
-        },
-        "eme_free_repacks_platforms": {
-            "firefox": ("win32", "win64", "macosx64")
-        },
-        "partner_repack_config": {
-            "firefox": {
-                "script_name": "scripts/desktop_partner_repacks.py",
-                "extra_args": [
-                    "--cfg", "partner_repacks/release_mozilla-release_desktop.py",
-                    "--s3cfg", "NO_UPLOADS_IN_STAGING",
-                ],
-            },
-        },
-        'release_channel_mappings': {
-            "firefox": [["^.*$", ["beta"]]],
-            "devedition": [["^.*$", ["aurora"]]],
-        },
-        'uptake_monitoring_platforms': {
-            "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-            "fennec": ("android-api-16", "android-x86"),
-            "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
-        },
-        # temp balrog
-        'balrog_api_root': 'http://54.90.211.22:8080/api',
-        'funsize_balrog_api_root': 'http://54.90.211.22:8080/api',
-        'tuxedoServerUrl': 'https://admin-bouncer-releng.stage.mozaws.net/api',
-        'bouncer_submitter_config': {
-            "firefox": "releases/bouncer_firefox_beta.py",
-            "devedition": "releases/bouncer_firefox_devedition.py",
-            "fennec": "releases/bouncer_fennec_beta.py",
-        },
-        'binary_transparency_enabled': True,
-        'bouncer_enabled': True,
-        'updates_builder_enabled': True,
-        'update_verify_enabled': True,
-        'postrelease_version_bump_enabled': {
-            "firefox": True,
-            "devedition": True,
-            "fennec": True,
-        },
-        'postrelease_version_bump_config': {
-            "firefox": 'releases/dev_postrelease_firefox_beta.py',
-            "devedition": 'releases/dev_postrelease_firefox_beta.py',
-            "fennec": 'releases/dev_postrelease_fennec_beta.py',
-        },
-        'uptake_monitoring_enabled': True,
-        'uptake_monitoring_config': {
-            "firefox": 'releases/bouncer_firefox_beta.py',
-            "devedition": 'releases/bouncer_firefox_devedition.py',
-            "fennec": "releases/bouncer_fennec_beta.py",
-        },
-        'postrelease_bouncer_aliases_enabled': True,
-        'postrelease_bouncer_aliases_config': {
-            "firefox": 'releases/bouncer_firefox_beta.py',
-            "devedition": 'releases/bouncer_firefox_devedition.py',
-            "fennec": "releases/bouncer_fennec_beta.py",
-        },
-        'postrelease_mark_as_shipped_enabled': True,
-        'postrelease_mark_as_shipped_config': {
-            "firefox": 'releases/dev_postrelease_firefox_beta.py',
-            "devedition": 'releases/dev_postrelease_firefox_beta.py',
-            "fennec": 'releases/dev_postrelease_fennec_beta.py',
-        },
-        'push_to_candidates_enabled': True,
-        'updates_config': {
-            "firefox": 'releases/dev_updates_firefox_beta.py',
-            "devedition": 'releases/dev_updates_firefox_devedition.py',
-            "fennec": "",
-        },
-        'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
-        'beetmover_buckets': {
-            'firefox': 'net-mozaws-stage-delivery-firefox',
-            'devedition': 'net-mozaws-stage-delivery-archive',
-            'fennec': 'net-mozaws-stage-delivery-archive',
-        },
-        'stage_product': {
-            'firefox': 'firefox',
-            'fennec': 'mobile',
-            'devedition': 'devedition',
-        },
-        'signing_class': {
-            "firefox": "release-signing",
-            "devedition": "nightly-signing",
-            "fennec": "dep-signing",
-        },
-        'signing_cert': {
-            "firefox": "release",
-            "devedition": "nightly",
-            "fennec": "depend",
-        },
-        'moz_disable_mar_cert_verification': False,
-        'accepted_mar_channel_id': {
-            "firefox": "firefox-mozilla-beta",
-            "devedition": "firefox-mozilla-aurora",
-            # TODO: fennec
-        },
-        'root_home_dir': {
-            "firefox": "desktop",
-            "devedition": "desktop",
-            "fennec": "mobile",
-        },
-        'enabled_products': ['firefox', 'mobile', 'devedition'],
-        'push_to_releases_automatic': False,
-        'merge_builds': False,
-        'snap_enabled': {"firefox": True, "devedition": False},
-        'update_verify_channel': {
-            'firefox': 'beta-localtest',
-            'devedition': 'aurora-localtest',
-        },
-        'tc_indexes': {
-            "firefox": {
-                "linux": {
-                    "unsigned": "gecko.v2.maple.nightly.revision.{rev}.firefox.linux-opt",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.nightly.revision.{rev}.firefox.linux-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "linux64": {
-                    "unsigned": "gecko.v2.maple.nightly.revision.{rev}.firefox.linux64-opt",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.nightly.revision.{rev}.firefox.linux64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "macosx64": {
-                    "unsigned": "gecko.v2.maple.nightly.revision.{rev}.firefox.macosx64-opt",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.firefox-l10n.macosx64-opt.en-US",
-                    "repackage": "gecko.v2.maple.nightly.revision.{rev}.firefox.macosx64-nightly-repackage",
-                    "repackage-signing": "gecko.v2.maple.nightly.revision.{rev}.firefox.macosx64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "win32": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win64": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-            },
-            "devedition": {
-                "linux": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.devedition-l10n.linux-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.devedition-l10n.linux-opt.en-US",
-                    "ci_system": "tc",
-                },
-                "linux64": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.devedition-l10n.linux64-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.devedition-l10n.linux64-opt.en-US",
-                    "ci_system": "tc",
-                },
-                "macosx64": {
-                    "unsigned": "gecko.v2.maple.nightly.revision.{rev}.devedition.macosx64-opt",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.devedition-l10n.macosx64-opt.en-US",
-                    "repackage": "gecko.v2.maple.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage.en-US",
-                    "repackage-signing": "gecko.v2.maple.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win32": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.devedition-l10n.win32-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.devedition-l10n.win32-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.revision.{rev}.firefox-l10n.win32-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win64": {
-                    "unsigned": "gecko.v2.maple.revision.{rev}.devedition-l10n.win64-opt.en-US",
-                    "signed": "gecko.v2.maple.signed-nightly.revision.{rev}.devedition-l10n.win64-opt.en-US",
-                    "repackage-signing": "gecko.v2.maple.revision.{rev}.firefox-l10n.win64-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-            },
-            # TODO: fennec
-        },
-        'lzma_to_bz2': False,
-    },
-    # Disabled by bug 1363047
-    # 'elm': {},
-    # Disabled by Bug 1135702
-    # 'fig': {},
-    # Disabled by Bug 1206269
-    # 'gum': {},
-    # Disabled by bug 1363047
-    # 'holly': {},
-
-    'jamun': {
-        'gecko_version': 56,
-        'watch_all_branches': True,
-        'desktop_mozharness_builds_enabled': True,
-        'use_mozharness_repo_cache': False,
-        'branch_projects': [],
-        ## TODO - enabled tests.
-        # note - to enable tests you must also remove:
-        # platforms[platform]["slave_platforms"] item override below
-        'enable_opt_unittests': False,
-        'enable_debug_unittests': False,
-        'enable_talos': False,
-        ##
-        'lock_platforms': True,
-        'platforms': {
-            # use default 'dep-signing' for now while in development
-            'linux': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'linux64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win32': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'macosx64': {
-                'dep_signing_servers': 'release-signing',
-                "slave_platforms": [],
-                "enable_dep": False,
-            },
-            'win32-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'win64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'macosx64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-            'linux64-devedition': {
-                'dep_signing_servers': 'nightly-signing',
-                "enable_dep": False,
-            },
-        },
-        'pgo_strategy': 'per-checkin',
-        'enable_release_promotion': {
-            "firefox": True,
-            "devedition": True,
-        },
-        'build_tools_repo_path': 'users/stage-ffxbld/tools',
-        "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "single_locale_branch_config": {
-            "firefox": "dev-mozilla-release",
-            "devedition": "dev-mozilla-beta_devedition",
-        },
-        'release_channel_mappings': {
-            "firefox": [["^.*$", ["beta"]]],
-            "devedition": [["^.*$", ["aurora"]]],
-        },
-        'uptake_monitoring_platforms': {
-            "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-            "fennec": ("android-api-15", "android-x86"),
-            "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
-        },
-        # temp balrog
-        'balrog_vpn_proxy': 'balrogStageVPNProxy',
-        'balrog_api_root': 'https://balrog-admin.stage.mozaws.net/api',
-        'funsize_balrog_api_root': 'http://balrog/api',
-        'tuxedoServerUrl': 'https://admin-bouncer-releng.stage.mozaws.net/api',
-        'bouncer_submitter_config': {
-            "firefox": "releases/bouncer_firefox_release.py",
-            "devedition": "releases/bouncer_firefox_devedition.py",
-        },
-        'binary_transparency_enabled': True,
-        'bouncer_enabled': True,
-        'updates_builder_enabled': True,
-        'update_verify_enabled': True,
-        'postrelease_version_bump_enabled': {
-            "firefox": True,
-            "devedition": False,
-            "fennec": True,
-        },
-        'postrelease_version_bump_config': {
-            "firefox": 'releases/dev_postrelease_firefox_release.py',
-            "devedition": 'disabled',
-        },
-        'uptake_monitoring_enabled': True,
-        'uptake_monitoring_config': {
-            "firefox": 'releases/bouncer_firefox_release.py',
-            "devedition": 'releases/bouncer_firefox_devedition.py',
-        },
-        'postrelease_bouncer_aliases_enabled': True,
-        'postrelease_bouncer_aliases_config': {
-            "firefox": 'releases/bouncer_firefox_release.py',
-            "devedition": 'releases/bouncer_firefox_devedition.py',
-        },
-        'postrelease_mark_as_shipped_enabled': True,
-        'postrelease_mark_as_shipped_config': {
-            "firefox": 'releases/dev_postrelease_firefox_release.py',
-            "devedition": 'releases/dev_postrelease_firefox_beta.py',
-        },
-        'push_to_candidates_enabled': True,
-        'updates_config': {
-            "firefox": 'releases/dev_updates_firefox_release.py',
-            "devedition": 'releases/dev_updates_firefox_devedition.py',
-        },
-        'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
-        'beetmover_buckets': {
-            'firefox': 'net-mozaws-stage-delivery-firefox',
-            'devedition': 'net-mozaws-stage-delivery-archive',
-        },
-        'stage_product': {
-            'firefox': 'firefox',
-            'fennec': 'mobile',
-            'devedition': 'devedition',
-        },
-        'signing_class': {
-            "firefox": "release-signing",
-            "devedition": "nightly-signing",
-        },
-        'signing_cert': {
-            "firefox": "release",
-            "devedition": "nightly",
-        },
-        'moz_disable_mar_cert_verification': False,
-        'accepted_mar_channel_id': {
-            "firefox": "firefox-mozilla-release",
-            "devedition": "firefox-mozilla-aurora",
-        },
-        'root_home_dir': {
-            "firefox": "desktop",
-            "devedition": "desktop",
-        },
-        'enabled_products': ['firefox', 'mobile', 'devedition'],
-        'push_to_releases_automatic': False,
-        'merge_builds': False,
-        'snap_enabled': {"firefox": True, "devedition": False},
-        'update_verify_channel': {
-            'firefox': 'release-localtest',
-            'devedition': 'aurora-localtest',
-        },
-        'tc_indexes': {
-            "firefox": {
-                "linux": {
-                    "unsigned": "gecko.v2.jamun.nightly.revision.{rev}.firefox.linux-opt",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.nightly.revision.{rev}.firefox.linux-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "linux64": {
-                    "unsigned": "gecko.v2.jamun.nightly.revision.{rev}.firefox.linux64-opt",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.nightly.revision.{rev}.firefox.linux64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "macosx64": {
-                    "unsigned": "gecko.v2.jamun.nightly.revision.{rev}.firefox.macosx64-opt",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.macosx64-opt.en-US",
-                    "repackage": "gecko.v2.jamun.nightly.revision.{rev}.firefox.macosx64-nightly-repackage",
-                    "repackage-signing": "gecko.v2.jamun.nightly.revision.{rev}.firefox.macosx64-nightly-repackage-signing",
-                    "ci_system": "tc",
-                },
-                "win32": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.win32-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win64": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.win64-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-            },
-            "devedition": {
-                "linux": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.linux-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.linux-opt.en-US",
-                    "ci_system": "tc",
-                },
-                "linux64": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.linux64-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.linux64-opt.en-US",
-                    "ci_system": "tc",
-                },
-                "macosx64": {
-                    "unsigned": "gecko.v2.jamun.nightly.revision.{rev}.devedition.macosx64-opt",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.macosx64-opt.en-US",
-                    "repackage": "gecko.v2.jamun.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage.en-US",
-                    "repackage-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.macosx64-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win32": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.win32-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.win32-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win32-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-                "win64": {
-                    "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.win64-opt.en-US",
-                    "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.win64-opt.en-US",
-                    "repackage-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win64-devedition-nightly-repackage-signing.en-US",
-                    "ci_system": "tc",
-                },
-            },
-            # TODO: fennec
-        },
-        # Disable when running beta staging releases
-        'lzma_to_bz2': False,
-    },
-    'larch': {
-        'lock_platforms': True,
-        'pgo_strategy': 'per-checkin',
-        'platforms': {
-            'linux': {},
-            'linux64': {},
-            'linux64-asan': {},
-            'linux64-debug': {},
-            'macosx64': {},
-            'macosx64-debug': {},
-            'win32': {},
-            'win32-debug': {},
-            'win64': {},
-            'win64-debug': {},
-        },
-    },
-    # customizations for integration work for bugs 481815 and 307181
-    'oak': {
-        'enable_nightly': True,
-        'updates_enabled': True,
-        'create_partial': True,
-        'enable_talos': False,
-        'pgo_strategy': 'periodic',
-        'platforms': {
-            'linux': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'linux64': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'macosx64': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'win32': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'win64': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-        },
-    },
-    'pine': {
-        'enable_perproduct_builds': False,
-        'mozharness_tag': 'default',
-        'enable_opt_unittests': True,
-        'enable_talos': True,
-    },
-    'graphics': {
-        'enable_perproduct_builds': False,
-        'mozharness_tag': 'default',
-        'enable_opt_unittests': True,
-        'enable_talos': True,
-    },
 }
 
 # All is the default
 ACTIVE_PROJECT_BRANCHES = PROJECT_BRANCHES.keys()
 
 # Load up project branches' local values
 for branch in PROJECT_BRANCHES.keys():
     PROJECT_BRANCHES[branch]['tinderbox_tree'] = PROJECT_BRANCHES[branch].get('tinderbox_tree', branch.title())
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -64,61 +64,32 @@ GLOBAL_VARS = {
     },
     'bucket_prefix': 'net-mozaws-stage-delivery',
 }
 
 BUILDS_BEFORE_REBOOT = 5
 
 # Local branch overrides
 BRANCHES = {
-    'mozilla-central': {
-        'enable_blocklist_update': False,
-        'enable_hsts_update': False,
-        'enable_hpkp_update': False,
-        'file_update_on_closed_tree': False,
-    },
-    'mozilla-release': {
-        'enable_blocklist_update': False,
-        'enable_hsts_update': False,
-        'enable_hpkp_update': False,
-        'file_update_on_closed_tree': False,
-    },
-    'mozilla-beta': {
-        'enable_blocklist_update': False,
-        'enable_hsts_update': False,
-        'enable_hpkp_update': False,
-        'file_update_on_closed_tree': False,
-    },
     'mozilla-esr52': {
         'enable_blocklist_update': False,
         'enable_hsts_update': False,
         'enable_hpkp_update': False,
         'file_update_on_closed_tree': False,
     },
     'try': {
         'enable_mail_notifier': False, # Set to True when testing
         'email_override': [], # Set to your address when testing
         'package_url': 'http://ftp.stage.mozaws.net/pub/firefox/try-builds',
         'talos_masters': [],
     },
 }
 
 PLATFORM_VARS = {}
 
-PROJECTS = {
-    'fuzzing': {
-        'scripts_repo': 'https://hg.mozilla.org/users/stage-ffxbld/tools',
-        'lithium_repo': 'https://github.com/MozillaSecurity/lithium.git',
-        'funfuzz_repo': 'https://github.com/MozillaSecurity/funfuzz.git',
-        'fuzzmanager_repo': 'https://github.com/MozillaSecurity/FuzzManager.git',
-        'fuzzing_remote_host': 'stage-ffxbld@pvtbuilds2.dmz.scl3.mozilla.com',
-        # Path needs extra leading slash due to optparse expansion on Win32
-        'fuzzing_base_dir': '//mnt/pvt_builds/staging/fuzzing/',
-        'idle_slaves': 0,
-    },
-}
+PROJECTS = {}
 
 BRANCH_PROJECTS = {
     'spidermonkey_tier_1': {
         'scripts_repo': 'https://hg.mozilla.org/users/stage-ffxbld/tools',
         'idle_slaves': 0,
     }
 }