Merge default -> production production
authorTom Prince <mozilla@hocat.ca>
Wed, 04 Jul 2018 18:21:22 -0600
branchproduction
changeset 15785 f143ad9f7c34cbf30e9f43ec78f884045e771a6d
parent 15781 48b4556e2a47d26543090532db46cf6bebf18179 (current diff)
parent 15784 e706417799fe3a2cfaf55246df266f3a88ba736d (diff)
child 15786 8ccca9cc74297e692691d01bfffb2fbe1008855a
push id11076
push usermozilla@hocat.ca
push dateThu, 05 Jul 2018 00:22:07 +0000
Merge default -> production
mozilla/release-thunderbird-comm-beta.py
mozilla/release-thunderbird-comm-beta.py.template
mozilla/staging_release-thunderbird-comm-beta.py
mozilla/staging_release-thunderbird-comm-beta.py.template
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,18 +24,18 @@ install:
   - pip install tox
 
 script:
   - if [[ $IGNORE_FAILURES == true ]]; then tox -e $TOX_ENV || true; else tox -e $TOX_ENV; fi
   # Remove logs to avoid cache uploads
   - rm -rf $HOME/.cache/pip/log
 
 
-# The channel name "irc.mozilla.org#releng" is encrypted against mozilla/build-buildbot-configs to prevent IRC spam of forks
-# Generated with: travis encrypt --repo mozilla/build-buildbot-configs  --skip-version-check irc.mozilla.org#releng
+# The channel name "irc.mozilla.org#releng-bots" is encrypted against mozilla/build-buildbot-configs to prevent IRC spam of forks
+# Generated with: travis encrypt --repo mozilla-releng/build-buildbot-configs --skip-version-check irc.mozilla.org#releng-bots
 notifications:
   irc:
     channels:
-      - secure: "f1e47N3dMJqHZ/uIctX3P+fmRf0yy3o2CCroKyCgMG3GxvCDocG1hdTtI7mRmaynWASGJNfZlQRO244tHQEjnv/SRNGtO/8GGvGF0h2gJDVho0SG1HSLRSk4jJvlrDAMjLRobDJBU6dT6cGQGhYVVXbIsjI8yS3P5Qe2cbIw4Jo="
+      - secure: "JIh4rR7PiDf+vjwh1p2UlExZuv32tZXJNod1KKRX9Am+1UzgORd0Tmzl/vAcDL//PePjNCrxIUYRfYESjJxsjddGf6JACihVLQuKXlMH4oZFt5N0pBXB/ETAt6Wld0SBiEHNlQrujkVjdg1tHovSx6msN2BQPOYhqdqHoNaqJ/A="
     on_success: always
     on_failure: always
     template:
       - "\x02%{repository_name}\x0314#%{build_number}\x03\x02 (%{branch} - %{commit} : %{author}): \x02\x0312%{message}\x02\x03 (\x0314%{build_url}\x03)"
--- a/dev-master_config.json.in
+++ b/dev-master_config.json.in
@@ -12,16 +12,16 @@
   "datacentre": "scl1",
   "db_name": "dev-master1.srv.releng.scl3.mozilla.com:@BASEDIR@/master",
   "enabled": true,
   "environment": "staging",
   "hostname": "dev-master1.srv.releng.scl3.mozilla.com",
   "http_port": @HTTP_PORT@,
   "master_dir": "@BASEDIR@/master",
   "release_branches": ["mozilla-release", "mozilla-beta"],
-  "thunderbird_release_branches": ["comm-beta", "comm-esr52"],
+  "thunderbird_release_branches": ["comm-esr52"],
   "name": "@MASTER_NAME@",
   "pb_port": @PB_PORT@,
   "role": "@ROLE@",
   "ssh_port": @SSH_PORT@,
   "tools_branch": "@TOOLS_BRANCH@",
   "tools_dir": "@BASEDIR@/tools"
 }]
--- a/mozilla/gecko_versions.json
+++ b/mozilla/gecko_versions.json
@@ -1,6 +1,6 @@
 {
-    "mozilla-release": 60,
-    "mozilla-beta": 61,
-    "mozilla-central": 62,
-    "comm-beta": 61
+    "mozilla-release": 59,
+    "mozilla-beta": 60,
+    "mozilla-central": 60,
+    "comm-beta": 59
 }
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-beta.py
+++ /dev/null
@@ -1,175 +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['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['relbranchPrefix']     = 'THUNDERBIRD'
-releaseConfig['mozilla_srcdir']      = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '60.0b6'
-releaseConfig['appVersion']          = '60.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_60_0b6'
-releaseConfig['partialUpdates']      = {
-
-    '60.0b3': {
-        'appVersion': '60.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_60_0b3',
-    },
-
-    '60.0b4': {
-        'appVersion': '60.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_60_0b4',
-    },
-
-    '60.0b5': {
-        'appVersion': '60.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_60_0b5',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextVersion']         = releaseConfig['version']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-beta',
-        'path': 'releases/comm-beta',
-        'revision': '53506318f147',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            'mail/config/version_display.txt': {
-                'version': releaseConfig['version'],
-                'nextVersion': releaseConfig['nextVersion']
-            },
-
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-beta',
-        'path': 'releases/mozilla-beta',
-        'revision': '481fea2011e6',
-        'relbranch': None,
-        'bumpFiles': {
-            'config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
-        }
-    }
-}
-#  L10n repositories
-releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'l10n-central'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-beta'
-#  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']  = ()
-
-# 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']           = 'archive.mozilla.org'
-releaseConfig['stagingServer']       = 'upload.tbirdbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials']       = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket']            = 'net-mozaws-prod-delivery-archive'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-releaseConfig['marSignatureFormat']  = 'mar_sha384'
-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/macosx64/release',
-    'win32': 'mail/config/mozconfigs/win32/release',
-}
-releaseConfig['source_mozconfig']      = 'mail/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel']        = 'beta'
-releaseConfig['updateChannels'] = {
-    "beta": {
-        "versionRegex": r"^.*$",
-        "ruleId": 43,
-        "patcherConfig": "mozBeta-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "beta-localtest",
-        "cdnTestChannel": "beta-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozBeta-thunderbird-linux.cfg",
-            "linux64":  "mozBeta-thunderbird-linux64.cfg",
-            "macosx64": "mozBeta-thunderbird-mac64.cfg",
-            "win32":  "mozBeta-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "beta-cdntest": {
-                "ruleId": 60,
-            },
-            "beta-localtest": {
-                "ruleId": 27,
-            },
-        }
-    }
-}
-
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-releaseConfig['bouncer_aliases']     = {
-    'Thunderbird-%(version)s': 'thunderbird-beta-latest',
-}
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-thunderbird-comm-beta.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.
-releaseConfig = {}
-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['relbranchPrefix']     = 'THUNDERBIRD'
-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['nextVersion']         = releaseConfig['version']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-beta',
-        'path': '{{ branch }}',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            'mail/config/version_display.txt': {
-                'version': releaseConfig['version'],
-                'nextVersion': releaseConfig['nextVersion']
-            },
-
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-beta',
-        'path': 'releases/mozilla-beta',
-        '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']        = 'l10n-central'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-beta'
-#  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']  = ()
-
-# 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']           = 'archive.mozilla.org'
-releaseConfig['stagingServer']       = 'upload.tbirdbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials']       = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket']            = 'net-mozaws-prod-delivery-archive'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl']     = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
-releaseConfig['marSignatureFormat']  = 'mar_sha384'
-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/macosx64/release',
-    'win32': 'mail/config/mozconfigs/win32/release',
-}
-releaseConfig['source_mozconfig']      = 'mail/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel']        = 'beta'
-releaseConfig['updateChannels'] = {
-    "beta": {
-        "versionRegex": r"^.*$",
-        "ruleId": 43,
-        "patcherConfig": "mozBeta-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "beta-localtest",
-        "cdnTestChannel": "beta-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozBeta-thunderbird-linux.cfg",
-            "linux64":  "mozBeta-thunderbird-linux64.cfg",
-            "macosx64": "mozBeta-thunderbird-mac64.cfg",
-            "win32":  "mozBeta-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "beta-cdntest": {
-                "ruleId": 60,
-            },
-            "beta-localtest": {
-                "ruleId": 27,
-            },
-        }
-    }
-}
-
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-releaseConfig['bouncer_aliases']     = {
-    'Thunderbird-%(version)s': 'thunderbird-beta-latest',
-}
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -106,61 +106,18 @@ for branch in ACTIVE_BRANCHES:
             else:
                 assert len(set(pre) - set(post)) == 0
 
         if not s.builderNames:
             # This scheduler has no builders left and should be removed
             branchObjects['schedulers'].remove(s)
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
-# get list of branches to disable buildbot builds for
-# Bug 1459831 - Switch off buildbot builds on comm-beta
-disable_tb_sched = []
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 61):
-    if name != "try":
-        disable_tb_sched.append(name)
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     branchObjects = generateBranchObjects(THUNDERBIRD_BRANCHES[branch], branch)
-
-    for s in branchObjects.get('schedulers', [])[:]:
-        # builder names to be deleted
-        if not s.builderNames:
-            continue
-
-        bnames = []
-        if branch in disable_tb_sched:
-            bnames.extend([
-                'TB Linux x86-64 ' + branch + ' periodic file update',
-                'TB Linux ' + branch + ' build',
-                'TB Linux ' + branch + ' leak test build',
-                'TB Linux x86-64' + branch + ' build',
-                'TB Linux x86-64' + branch + ' leak test build',
-                'TB OS X 10.7 ' + branch + " build",
-                'TB WINNT 5.2 ' + branch + " build",
-                'TB WINNT 5.2 ' + branch + " leak test build",
-                'TB WINNT 5.2 ' + branch + " pgo-build",
-                'TB WINNT 6.1 x86-64 ' + branch + " build",
-                'TB WINNT 6.1 x86-64 ' + branch + " pgo-build",
-                'TB WINNT 6.1 x86-64 ' + branch + " leak test build",
-            ])
-        for bname in bnames:
-            pre = s.builderNames
-            s.builderNames = [b for b in s.builderNames if builder_filter(bname, b)]
-            post = s.builderNames
-            # builder name to be deleted
-            if bname in set(pre) - set(post):
-                assert len(set(pre) - set(post)) == 1
-            # schedulers did not include builder name to be deleted
-            else:
-                assert len(set(pre) - set(post)) == 0
-
-        if not s.builderNames:
-            # This scheduler has no builders left and should be removed
-            branchObjects['schedulers'].remove(s)
-
     # Strip away any duplicate change sources
     usefulChangeSources = []
     for cs in branchObjects['change_source']:
         if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
             usefulChangeSources.append(cs)
     branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-beta.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.
-EMAIL_RECIPIENTS = []
-
-releaseConfig = {}
-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['relbranchPrefix']     = 'THUNDERBIRD'
-releaseConfig['mozilla_srcdir']      = 'mozilla'
-#  Current version info
-releaseConfig['version']             = '33.0b1'
-releaseConfig['appVersion']          = '33.0'
-releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 1
-releaseConfig['baseTag']             = 'THUNDERBIRD_33_0b1'
-releaseConfig['partialUpdates']      = {
-
-    '32.0b1': {
-        'appVersion': '32.0',
-        'buildNumber': 1,
-        'baseTag': 'THUNDERBIRD_32_0b1',
-    },
-
-}
-#  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextVersion']         = releaseConfig['version']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-beta',
-        'path': 'users/stage-ffxbld/comm-beta',
-        'revision': 'default',
-        'relbranch': None,
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            'mail/config/version_display.txt': {
-                'version': releaseConfig['version'],
-                'nextVersion': releaseConfig['nextVersion']
-            },
-
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-beta',
-        'path': 'users/stage-ffxbld/mozilla-beta',
-        '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-beta'
-#  Support repositories
-releaseConfig['otherReposToTag']     = {
-    'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
-    'users/stage-ffxbld/buildbot': 'production-0.8',
-    'users/stage-ffxbld/mozharness': 'production',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms']       = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = ()
-
-# 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']           = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer']       = 'upload.tbirdbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials']       = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket']            = 'net-mozaws-stage-delivery-archive'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4-dev.allizom.org'
-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/macosx64/release',
-    'win32': 'mail/config/mozconfigs/win32/release',
-}
-releaseConfig['source_mozconfig']      = 'mail/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel']        = 'beta'
-releaseConfig['updateChannels'] = {
-    "beta": {
-        "versionRegex": r"^.*$",
-        "ruleId": 33,
-        "patcherConfig": "mozBeta-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "beta-localtest",
-        "cdnTestChannel": "beta-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozBeta-thunderbird-linux.cfg",
-            "linux64":  "mozBeta-thunderbird-linux64.cfg",
-            "macosx64": "mozBeta-thunderbird-mac64.cfg",
-            "win32":  "mozBeta-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "beta-cdntest": {
-                "ruleId": 43,
-            },
-            "beta-localtest": {
-                "ruleId": 21,
-            },
-        }
-    }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://admin-bouncer-releng.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-releaseConfig['bouncer_aliases']     = {
-    'Thunderbird-%(version)s': 'thunderbird-beta-latest',
-}
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}
deleted file mode 100644
--- a/mozilla/staging_release-thunderbird-comm-beta.py.template
+++ /dev/null
@@ -1,165 +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['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['relbranchPrefix']     = 'THUNDERBIRD'
-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['nextVersion']         = releaseConfig['version']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
-#  Repository configuration, for tagging
-releaseConfig['sourceRepositories']  = {
-    'comm': {
-        'name': 'comm-beta',
-        'path': '{{ branch }}',
-        'revision': '{{ commRevision }}',
-        'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
-        'bumpFiles': {
-            'mail/config/version.txt': {
-                'version': releaseConfig['appVersion'],
-                'nextVersion': releaseConfig['nextAppVersion']
-            },
-            'mail/config/version_display.txt': {
-                'version': releaseConfig['version'],
-                'nextVersion': releaseConfig['nextVersion']
-            },
-
-        }
-    },
-    'mozilla': {
-        'name': 'mozilla-beta',
-        'path': 'users/stage-ffxbld/mozilla-beta',
-        '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-beta'
-#  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']     = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms']  = ()
-
-# 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']            = '/home/mock_mozilla/.ssh/tbirdbld_dsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer']           = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer']       = 'upload.tbirdbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials']       = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket']            = 'net-mozaws-stage-delivery-archive'
-releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['ausServerUrl']        = 'https://aus4-dev.allizom.org'
-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/macosx64/release',
-    'win32': 'mail/config/mozconfigs/win32/release',
-}
-releaseConfig['source_mozconfig']      = 'mail/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel']        = 'beta'
-releaseConfig['updateChannels'] = {
-    "beta": {
-        "versionRegex": r"^.*$",
-        "ruleId": 33,
-        "patcherConfig": "mozBeta-thunderbird-branch-patcher2.cfg",
-        "localTestChannel": "beta-localtest",
-        "cdnTestChannel": "beta-cdntest",
-        "verifyConfigs": {
-            "linux":  "mozBeta-thunderbird-linux.cfg",
-            "linux64":  "mozBeta-thunderbird-linux64.cfg",
-            "macosx64": "mozBeta-thunderbird-mac64.cfg",
-            "win32":  "mozBeta-thunderbird-win32.cfg",
-        },
-        "testChannels": {
-            "beta-cdntest": {
-                "ruleId": 43,
-            },
-            "beta-localtest": {
-                "ruleId": 21,
-            },
-        }
-    }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks']    = False
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl']     = 'https://admin-bouncer-releng.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
-releaseConfig['bouncer_aliases']     = {
-    'Thunderbird-%(version)s': 'thunderbird-beta-latest',
-}
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -819,16 +819,25 @@ BRANCHES['comm-beta']['localesURL'] = \
     '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-beta' % (GLOBAL_VARS['hgurl'])
 # temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
 BRANCHES['comm-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['comm-beta']['enable_blocklist_update'] = True
 BRANCHES['comm-beta']['file_update_on_closed_tree'] = False
+# Thunderbird no longer builds succesfully on buildbot, so don't try building it
+for platform in BRANCHES['comm-beta']['platforms'].keys():
+    if platform != 'linux64':
+        del BRANCHES['comm-beta']['platforms'][platform]
+# This keeps the 'TB Linux x86-64 comm-beta periodic' builder around
+# while disabling all other builders
+BRANCHES['comm-beta']['enable_nightly'] = False
+BRANCHES['comm-beta']['enable_periodic'] = False
+BRANCHES['comm-beta']['platforms']['linux64']['enable_dep'] = False
 
 ######## try
 # Try-specific configs
 BRANCHES['try-comm-central']['stage_username'] = 'trybld'
 BRANCHES['try-comm-central']['stage_ssh_key'] = 'trybld_dsa'
 BRANCHES['try-comm-central']['stage_base_path'] = '/home/ftp/pub/thunderbird/try-builds'
 BRANCHES['try-comm-central']['enable_merging'] = False
 BRANCHES['try-comm-central']['enable_try'] = True