Bug 426214 - re-enable blocklist updating for mozilla-central, 1.9.2, and 1.9.1 - r=bhearsum
authorChris Cooper <ccooper@deadsquid.com>
Fri, 03 Dec 2010 17:38:13 -0500
changeset 3347 e2cf5d5ad9556fc39957c2184c4e1dc2a206d35f
parent 3346 b92b68f37e2eb90f40d760c8b6f96ba4010d08bb
child 3348 72da575398256a9fff7da58034465f11d7500107
push id2643
push usercoop@mozilla.com
push dateFri, 03 Dec 2010 22:38:19 +0000
reviewersbhearsum
bugs426214
Bug 426214 - re-enable blocklist updating for mozilla-central, 1.9.2, and 1.9.1 - r=bhearsum
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -733,17 +733,17 @@ BRANCHES['mozilla-central']['create_part
 BRANCHES['mozilla-central']['aus2_user'] = 'ffxbld'
 BRANCHES['mozilla-central']['aus2_ssh_key'] = 'ffxbld_dsa'
 BRANCHES['mozilla-central']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-central'
 BRANCHES['mozilla-central']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-central'
 BRANCHES['mozilla-central']['aus2_mobile_base_upload_dir'] = '/opt/aus2/incoming/2/Fennec/mozilla-central'
 BRANCHES['mozilla-central']['aus2_mobile_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Fennec/mozilla-central'
 BRANCHES['mozilla-central']['mobile_platforms']['android-r7']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'mozilla-central'
 BRANCHES['mozilla-central']['mobile_platforms']['android-r7-nothumb']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'mozilla-central-nothumb'
-BRANCHES['mozilla-central']['enable_blocklist_update'] = False
+BRANCHES['mozilla-central']['enable_blocklist_update'] = True
 BRANCHES['mozilla-central']['blocklist_update_on_closed_tree'] = True
 
 ######## shadow-central
 # custom settings for shadow-central repo
 BRANCHES['shadow-central']['hgurl'] = 'https://hgpvt.mozilla.org/'
 # have to use complete config repo path so it doesn't look to https://hgpvt.mozilla.org
 BRANCHES['shadow-central']['config_repo_path'] = 'http://hg.mozilla.org/build/buildbot-configs'
 # This is a path, relative to HGURL, where the repository is located
@@ -884,18 +884,18 @@ BRANCHES['mozilla-1.9.1']['enUS_binaryUR
 BRANCHES['mozilla-1.9.1']['allLocalesFile'] = 'browser/locales/all-locales'
 BRANCHES['mozilla-1.9.1']['create_snippet'] = True
 BRANCHES['mozilla-1.9.1']['create_partial'] = True
 BRANCHES['mozilla-1.9.1']['create_partial_l10n'] = False
 BRANCHES['mozilla-1.9.1']['aus2_user'] = 'ffxbld'
 BRANCHES['mozilla-1.9.1']['aus2_ssh_key'] = 'ffxbld_dsa'
 BRANCHES['mozilla-1.9.1']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.1'
 BRANCHES['mozilla-1.9.1']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.1'
-BRANCHES['mozilla-1.9.1']['enable_blocklist_update'] = False
-BRANCHES['mozilla-1.9.1']['blocklist_update_on_closed_tree'] = False
+BRANCHES['mozilla-1.9.1']['enable_blocklist_update'] = True
+BRANCHES['mozilla-1.9.1']['blocklist_update_on_closed_tree'] = True
 
 ######## mozilla-1.9.2
 BRANCHES['mozilla-1.9.2']['repo_path'] = 'releases/mozilla-1.9.2'
 BRANCHES['mozilla-1.9.2']['mobile_repo_path'] = 'releases/mobile-1.1'
 BRANCHES['mozilla-1.9.2']['l10n_repo_path'] = 'releases/l10n-mozilla-1.9.2'
 BRANCHES['mozilla-1.9.2']['brand_name'] = 'Namoroka'
 BRANCHES['mozilla-1.9.2']['start_hour'] = [3]
 BRANCHES['mozilla-1.9.2']['start_minute'] = [32]
@@ -953,18 +953,18 @@ BRANCHES['mozilla-1.9.2']['enUS_binaryUR
 BRANCHES['mozilla-1.9.2']['allLocalesFile'] = 'browser/locales/all-locales'
 BRANCHES['mozilla-1.9.2']['create_snippet'] = True
 BRANCHES['mozilla-1.9.2']['create_partial'] = True
 BRANCHES['mozilla-1.9.2']['create_partial_l10n'] = True
 BRANCHES['mozilla-1.9.2']['aus2_user'] = 'ffxbld'
 BRANCHES['mozilla-1.9.2']['aus2_ssh_key'] = 'ffxbld_dsa'
 BRANCHES['mozilla-1.9.2']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.2'
 BRANCHES['mozilla-1.9.2']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-1.9.2'
-BRANCHES['mozilla-1.9.2']['enable_blocklist_update'] = False
-BRANCHES['mozilla-1.9.2']['blocklist_update_on_closed_tree'] = False
+BRANCHES['mozilla-1.9.2']['enable_blocklist_update'] = True
+BRANCHES['mozilla-1.9.2']['blocklist_update_on_closed_tree'] = True
 
 ######## tracemonkey
 BRANCHES['tracemonkey']['repo_path'] = 'tracemonkey'
 BRANCHES['tracemonkey']['start_hour'] = [3]
 BRANCHES['tracemonkey']['start_minute'] = [32]
 BRANCHES['tracemonkey']['platforms']['linux']['build_space'] = 7
 BRANCHES['tracemonkey']['platforms']['linux64']['build_space'] = 7
 # Disable XULRunner / SDK builds