Bug 1459249 - Reconfigure try BB to be like esr52. r=nthomas
authorJustin Wood <Callek@gmail.com>
Thu, 10 May 2018 17:39:05 -0400
changeset 15768 d5b501df0bc75aae0f45f53cbf66b0c75fe69c2a
parent 15766 ea30fb096227496bca2a8b5d9d6d6c5040e3f951
child 15769 4dcae2d97474326f52058ff0c4d0ad71088db7cf
child 15772 d78ea27fd5fbe184bee61898f698959b8df9939f
push id11067
push userCallek@gmail.com
push dateMon, 14 May 2018 12:21:52 +0000
reviewersnthomas
bugs1459249
Bug 1459249 - Reconfigure try BB to be like esr52. r=nthomas Differential Revision: https://phabricator.services.mozilla.com/D1259
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1838,19 +1838,31 @@ BRANCHES = {
             'linux64-debug': {},
             'macosx64-debug': {},
             'win32-debug': {},
             'win64-debug': {},
         },
     },
     'try': {
         'branch_projects': [],
-        # The following platforms are not part of the default set,
-        # so only run on Try.
-        'extra_platforms': {
+        # Now that gecko 60+ is TC-only and nothing else active uses buildbot
+        # Make try pushes assume gecko 52! - Bug 1459249
+        'lock_platforms': True,
+        'gecko_version': 52,
+        'platforms': {
+            'linux': {},
+            'linux64': {},
+            'macosx64': {},
+            'win32': {},
+            'win64': {},
+            'linux-debug': {},
+            'linux64-debug': {},
+            'macosx64-debug': {},
+            'win32-debug': {},
+            'win64-debug': {},
         },
     },
 }
 
 setMainFirefoxVersions(BRANCHES)
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
@@ -2549,55 +2561,52 @@ BRANCHES['try']['stage_username_mobile']
 BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
 BRANCHES['try']['stage_ssh_mobile_key'] = 'trybld_dsa'
 BRANCHES['try']['stage_base_path'] = '/home/ftp/pub/firefox/try-builds'
 BRANCHES['try']['stage_base_path_mobile'] = '/home/ftp/pub/firefox/try-builds'
 BRANCHES['try']['enable_merging'] = False
 BRANCHES['try']['enable_try'] = True
 BRANCHES['try']['watch_all_branches'] = True
 BRANCHES['try']['pgo_strategy'] = 'try'
+BRANCHES['try']['enable_mac_a11y'] = True
+BRANCHES['try']['platforms']['macosx64']['platform_objdir'] = "%s/x86_64" % OBJDIR
 BRANCHES['try']['package_dir'] = '%(who)s-%(got_revision)s/'
 # This is a path, relative to HGURL, where the repository is located
 # HGURL  repo_path should be a valid repository
 BRANCHES['try']['repo_path'] = 'try'
 BRANCHES['try']['start_hour'] = [3]
 BRANCHES['try']['start_minute'] = [2]
 # Disable Nightly builds
 BRANCHES['try']['enable_nightly'] = False
 BRANCHES['try']['enable_mac_a11y'] = True
 BRANCHES['try']['enable_l10n'] = True
 BRANCHES['try']['desktop_mozharness_repacks_enabled'] = True
 BRANCHES['try']['l10n_platforms'] = ['linux', 'linux64', 'win32', 'macosx64',
                                      'win64']
 BRANCHES['try']['enable_l10n_dep_scheduler'] = False
+BRANCHES['try']['enable_nightly'] = False
 BRANCHES['try']['l10nNightlyUpdate'] = False
 BRANCHES['try']['l10nDatedDirs'] = False
 # need this or the master.cfg will bail
 BRANCHES['try']['platforms']['linux']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['win32']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['win64']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['win64-debug']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['macosx64']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['linux-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64-asan']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64-asan-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
-BRANCHES['try']['platforms']['android-api-15']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['android-api-15-debug']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['android-x86']['slaves'] = TRY_SLAVES['mock']
 for platform in BRANCHES['try']['platforms'].keys():
     # Disable symbol upload across the board
     BRANCHES['try']['platforms'][platform]['upload_symbols'] = False
     # only one l10n builder
     if BRANCHES['try']['platforms'][platform].get('mozharness_desktop_l10n', {}).get('l10n_chunks'):
        BRANCHES['try']['platforms'][platform]['mozharness_desktop_l10n']['l10n_chunks'] = 1
-del BRANCHES['try']['platforms']['linux64-av']
 
 ######## generic branch configs
 for branch in ACTIVE_PROJECT_BRANCHES:
     branchConfig = PROJECT_BRANCHES[branch]
     BRANCHES[branch]['product_name'] = branchConfig.get('product_name', None)
     BRANCHES[branch]['app_name'] = branchConfig.get('app_name', None)
     BRANCHES[branch]['brand_name'] = branchConfig.get('brand_name', None)
     BRANCHES[branch]['repo_path'] = branchConfig.get('repo_path', 'projects/' + branch)