Bug 1354818 - Remove comm-aurora from builders r=frg seamonkey-production
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 21 Apr 2017 10:40:09 +0800
branchseamonkey-production
changeset 15091 c6b3f4dfe82547940fed12a160a0ddf7466c4cb9
parent 15087 9777612ed7b0728dc0245e01727e7bcee80ae5a8
child 15092 faa65697a81ee2ad8fcbd2f697bf9dc4abb4c928
push id10563
push userewong@pw-wspx.org
push dateFri, 21 Apr 2017 02:40:43 +0000
reviewersfrg
bugs1354818
Bug 1354818 - Remove comm-aurora from builders r=frg
seamonkey/config.py
seamonkey/gecko_versions.json
--- a/seamonkey/config.py
+++ b/seamonkey/config.py
@@ -504,17 +504,16 @@ for platform in PLATFORM_VARS.values():
     platform['env'] = deepcopy(GLOBAL_ENVS)
   else:
     platform['env'].update((k, v) for k, v in GLOBAL_ENVS.items() if k not in platform['env'])
 
 # All branches that are to be built MUST be listed here, along with their
 # platforms (if different from the default set).
 BRANCHES = {
     'comm-central-trunk': {},
-    'comm-aurora': {},
     'comm-beta': {},
     'comm-release': {},
 }
 
 setMainCommVersions(BRANCHES)
 
 # Copy global vars in first, then platform vars
 for branch in BRANCHES.keys():
@@ -570,60 +569,16 @@ BRANCHES['comm-central-trunk']['update_c
 BRANCHES['comm-central-trunk']['create_partial'] = True
 BRANCHES['comm-central-trunk']['create_partial_l10n'] = True
 BRANCHES['comm-central-trunk']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-central-trunk'
 BRANCHES['comm-central-trunk']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-central-trunk'
 # staging/production-dependent settings - all is production for us
 BRANCHES['comm-central-trunk']['tinderbox_tree'] = 'SeaMonkey'
 BRANCHES['comm-central-trunk']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey'
 
-######## comm-aurora
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['comm-aurora']['repo_path'] = 'releases/comm-aurora'
-BRANCHES['comm-aurora']['mozilla_repo_path'] = 'releases/mozilla-aurora'
-BRANCHES['comm-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
-BRANCHES['comm-aurora']['enable_nightly'] = True
-BRANCHES['comm-aurora']['start_hour'] = [1]
-BRANCHES['comm-aurora']['start_minute'] = [30]
-BRANCHES['comm-aurora']['enable_mac_a11y'] = True
-BRANCHES['comm-aurora']['unittest_build_space'] = 6
-BRANCHES['comm-aurora']['enable_blocklist_update'] = True
-BRANCHES['comm-aurora']['blocklist_update_on_closed_tree'] = True
-# And code coverage
-BRANCHES['comm-aurora']['enable_codecoverage'] = False
-# L10n configuration
-BRANCHES['comm-aurora']['enable_l10n'] = True
-BRANCHES['comm-aurora']['enable_l10n_onchange'] = True
-BRANCHES['comm-aurora']['l10nNightlyUpdate'] = True
-BRANCHES['comm-aurora']['l10n_platforms'] = ['mock', 'win32', 'macosx64']
-BRANCHES['comm-aurora']['l10nDatedDirs'] = True
-BRANCHES['comm-aurora']['l10n_tree'] = 'sea_aurora'
-BRANCHES['comm-aurora']['mozilla_srcdir'] = 'mozilla'
-#make sure it has an ending slash
-BRANCHES['comm-aurora']['l10nUploadPath'] = \
-    '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-aurora-l10n/'
-BRANCHES['comm-aurora']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-aurora'
-BRANCHES['comm-aurora']['allLocalesFile'] = 'suite/locales/all-locales'
-BRANCHES['comm-aurora']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-aurora' % (GLOBAL_VARS['hgurl'])
-# 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-aurora']['create_snippet'] = True
-BRANCHES['comm-aurora']['update_channel'] = 'aurora'
-BRANCHES['comm-aurora']['create_partial'] = True
-BRANCHES['comm-aurora']['create_partial_l10n'] = True
-BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-aurora'
-BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-aurora'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-aurora']['tinderbox_tree'] = 'SeaMonkey-Aurora'
-BRANCHES['comm-aurora']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey-Aurora'
-
 ######## comm-beta
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-beta']['repo_path'] = 'releases/comm-beta'
 BRANCHES['comm-beta']['mozilla_repo_path'] = 'releases/mozilla-beta'
 BRANCHES['comm-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['comm-beta']['enable_nightly'] = False
 BRANCHES['comm-beta']['start_hour'] = [0]
--- a/seamonkey/gecko_versions.json
+++ b/seamonkey/gecko_versions.json
@@ -1,9 +1,8 @@
 {
-    "mozilla-release": 52,
-    "mozilla-beta": 53,
-    "mozilla-aurora":  54,
+    "mozilla-release": 53,
+    "mozilla-beta": 54,
     "mozilla-central": 55,
-    "comm-release": 52,
-    "comm-beta": 53,
+    "comm-release": 53,
+    "comm-beta": 54,
     "comm-aurora": 54
 }