--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -87,17 +87,17 @@ PLATFORM_VARS = {
'product_name': 'b2g',
'app_name': 'b2g',
'unittest_platform': 'linux32_gecko-opt',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/linux32_gecko/nightly',
'enable_dep': True,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -186,17 +186,17 @@ PLATFORM_VARS = {
'unittest_platform': 'linux32_gecko-debug',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/debug',
'src_mozconfig': 'b2g/config/mozconfigs/linux32_gecko/debug',
'enable_dep': False,
'enable_periodic': True,
'enable_nightly': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -283,17 +283,17 @@ PLATFORM_VARS = {
'product_name': 'b2g',
'app_name': 'b2g',
'unittest_platform': 'linux64_gecko-opt',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/linux64_gecko/nightly',
'enable_dep': True,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -360,17 +360,17 @@ PLATFORM_VARS = {
'unittest_platform': 'linux64_gecko-debug',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/debug',
'src_mozconfig': 'b2g/config/mozconfigs/linux64_gecko/debug',
'enable_dep': False,
'enable_periodic': True,
'enable_nightly': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 16,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -512,17 +512,17 @@ PLATFORM_VARS = {
'product_name': 'b2g',
'app_name': 'b2g',
'unittest_platform': 'macosx64_gecko-opt',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/macosx64_gecko/nightly',
'enable_dep': True,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['macosx64-lion'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -568,17 +568,17 @@ PLATFORM_VARS = {
'unittest_platform': 'macosx64_gecko-debug',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/debug',
'src_mozconfig': 'b2g/config/mozconfigs/macosx64_gecko/debug',
'enable_dep': False,
'enable_periodic': True,
'enable_nightly': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
'slaves': SLAVES['macosx64-lion'],
'platform_objdir': OBJDIR,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
@@ -673,17 +673,17 @@ PLATFORM_VARS = {
'src_mozconfig': 'b2g/config/mozconfigs/win32_gecko/nightly',
'enable_dep': False,
'enable_periodic': True,
'profiled_build': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['win64-rev2'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
'stage_product': 'b2g',
'stage_platform': 'win32_gecko',
'update_platform': 'WINNT_x86-msvc',
'enable_shared_checkouts': True,
@@ -728,17 +728,17 @@ PLATFORM_VARS = {
'enable_dep': False,
'enable_periodic': True,
'enable_nightly': False,
'profiled_build': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['win64-rev2'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
'stage_product': 'b2g',
'stage_platform': 'win32_gecko-debug',
'update_platform': 'WINNT_x86-msvc',
'enable_shared_checkouts': True,
@@ -777,17 +777,17 @@ PLATFORM_VARS = {
'linux32_gecko_localizer': {
'product_name': 'b2g',
'app_name': 'b2g',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/linux32_gecko/nightly',
'enable_dep': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': False,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
@@ -881,17 +881,17 @@ PLATFORM_VARS = {
'src_mozconfig': 'b2g/dev/config/mozconfigs/win32/mulet',
'enable_dep': True,
'profiled_build': False,
'enable_nightly': True,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['win64-rev2'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
'unittest_platform': 'win32-mulet-opt',
'stage_product': 'b2g',
'stage_platform': 'win32-mulet',
'update_platform': 'WINNT_x86-msvc',
@@ -921,17 +921,17 @@ PLATFORM_VARS = {
'linux64_gecko_localizer': {
'product_name': 'b2g',
'app_name': 'b2g',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/linux64_gecko/nightly',
'enable_dep': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': False,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
@@ -998,17 +998,17 @@ PLATFORM_VARS = {
'macosx64_gecko_localizer': {
'product_name': 'b2g',
'app_name': 'b2g',
'base_name': builder_prefix + '_%(branch)s_%(platform)s',
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/macosx64_gecko/nightly',
'enable_dep': False,
'profiled_build': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': True,
'packageTests': False,
'slaves': SLAVES['macosx64-lion'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
@@ -1058,17 +1058,17 @@ PLATFORM_VARS = {
'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
'src_mozconfig': 'b2g/config/mozconfigs/win32_gecko/nightly',
'enable_dep': False,
'profiled_build': False,
'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 13,
'upload_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['win64-rev2'],
'platform_objdir': OBJDIR,
'unittest_masters': [],
'stage_product': 'b2g',
'stage_platform': 'win32_gecko_localizer',
'update_platform': 'WINNT_x86-msvc',
'enable_shared_checkouts': True,
@@ -1696,18 +1696,16 @@ for branch in BRANCHES.keys():
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-central']['repo_path'] = 'mozilla-central'
BRANCHES['mozilla-central']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
BRANCHES['mozilla-central']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
BRANCHES['mozilla-central']['start_hour'] = [1, 16]
BRANCHES['mozilla-central']['start_minute'] = [2]
BRANCHES['mozilla-central']['periodic_start_hours'] = range(1, 24, 3)
BRANCHES['mozilla-central']['periodic_start_minute'] = 30
-BRANCHES['mozilla-central']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-central']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-central']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-central']['platforms']['nexus-5-l']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-5-l_eng']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['nexus-5-l_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-central']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-central']['platforms']['flame-kk_eng']['enable_nightly'] = True
@@ -1725,18 +1723,16 @@ BRANCHES['mozilla-central']['platforms']
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = 'releases/mozilla-b2g37_v2_2'
BRANCHES['mozilla-b2g37_v2_2']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
BRANCHES['mozilla-b2g37_v2_2']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
BRANCHES['mozilla-b2g37_v2_2']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g37_v2_2']['start_minute'] = [25]
BRANCHES['mozilla-b2g37_v2_2']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-5-l']['enable_periodic'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['nexus-5-l_eng']['enable_periodic'] = False
BRANCHES['mozilla-b2g37_v2_2']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g37_v2_2']['platforms']['emulator']['enable_nightly'] = True
@@ -1753,18 +1749,16 @@ BRANCHES['mozilla-b2g37_v2_2']['platform
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = 'releases/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_1/'
BRANCHES['mozilla-b2g34_v2_1']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g34_v2_1']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g34_v2_1']['start_minute'] = [12]
BRANCHES['mozilla-b2g34_v2_1']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-5-l']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1']['platforms']['nexus-5-l_eng']['enable_periodic'] = False
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1']['platforms']['flame-kk']['enable_nightly'] = True
@@ -1782,18 +1776,16 @@ BRANCHES['mozilla-b2g34_v2_1']['platform
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = 'releases/mozilla-b2g34_v2_1s'
BRANCHES['mozilla-b2g34_v2_1s']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_1/'
BRANCHES['mozilla-b2g34_v2_1s']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g34_v2_1s']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g34_v2_1s']['start_minute'] = [12]
BRANCHES['mozilla-b2g34_v2_1s']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g34_v2_1s']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-b2g34_v2_1s']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-kk-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin-512']['enable_nightly'] = True
BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin-512_eng']['enable_nightly'] = True
@@ -1811,18 +1803,16 @@ BRANCHES['mozilla-b2g34_v2_1s']['platfor
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = 'releases/mozilla-b2g32_v2_0'
BRANCHES['mozilla-b2g32_v2_0']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_0/'
BRANCHES['mozilla-b2g32_v2_0']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g32_v2_0']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g32_v2_0']['start_minute'] = [2]
BRANCHES['mozilla-b2g32_v2_0']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-b2g32_v2_0']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['flame-kk']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['flame-kk_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g32_v2_0']['platforms']['emulator-kk']['enable_nightly'] = True
@@ -1834,18 +1824,16 @@ BRANCHES['mozilla-b2g32_v2_0']['platform
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
BRANCHES['mozilla-b2g30_v1_4']['repo_path'] = 'releases/mozilla-b2g30_v1_4'
BRANCHES['mozilla-b2g30_v1_4']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v1_4/'
BRANCHES['mozilla-b2g30_v1_4']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
BRANCHES['mozilla-b2g30_v1_4']['start_hour'] = [0, 16]
BRANCHES['mozilla-b2g30_v1_4']['start_minute'] = [2]
BRANCHES['mozilla-b2g30_v1_4']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir'] = 'fake'
-BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir_l10n'] = 'fake'
BRANCHES['mozilla-b2g30_v1_4']['platforms']['nexus-4']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['flame']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['flame_eng']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-jb']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-jb-debug']['enable_nightly'] = True
BRANCHES['mozilla-b2g30_v1_4']['platforms']['emulator-kk']['enable_nightly'] = True
@@ -1987,23 +1975,20 @@ for branch in ACTIVE_PROJECT_BRANCHES:
GLOBAL_VARS['enabled_products'])
BRANCHES[branch]['enable_nightly'] = branchConfig.get('enable_nightly', False)
BRANCHES[branch]['enable_nightly_everytime'] = branchConfig.get('enable_nightly_everytime', False)
BRANCHES[branch]['periodic_start_hours'] = branchConfig.get('periodic_start_hours', range(0, 24, 6))
BRANCHES[branch]['periodic_start_minute'] = branchConfig.get('periodic_start_minute', 30)
BRANCHES[branch]['start_hour'] = branchConfig.get('start_hour', [4])
BRANCHES[branch]['start_minute'] = branchConfig.get('start_minute', [42])
# nightly updates
- BRANCHES[branch]['create_snippet'] = branchConfig.get('create_snippet', False)
+ BRANCHES[branch]['updates_enabled'] = branchConfig.get('updates_enabled', False)
BRANCHES[branch]['update_channel'] = branchConfig.get('update_channel', 'nightly-%s' % branch)
BRANCHES[branch]['create_partial'] = branchConfig.get('create_partial', False)
BRANCHES[branch]['create_partial_l10n'] = branchConfig.get('create_partial_l10n', False)
- BRANCHES[branch]['aus2_user'] = branchConfig.get('aus2_user', GLOBAL_VARS['aus2_user'])
- BRANCHES[branch]['aus2_ssh_key'] = branchConfig.get('aus2_ssh_key', GLOBAL_VARS['aus2_ssh_key'])
- BRANCHES[branch]['aus2_base_upload_dir'] = branchConfig.get('aus2_base_upload_dir', '/opt/aus2/incoming/2/B2G/' + branch)
BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
# Platform-specific defaults/interpretation
for platform in BRANCHES[branch]['platforms']:
# point to the mozconfigs, default is generic
if platform.endswith('debug'):
BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform.split('-')[0] + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/debug'
else:
BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/nightly'--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -95,17 +95,17 @@ GLOBAL_VARS = {
# List of keys in BRANCH_PROJECTS that will be activated for the BRANCH
'branch_projects': ['spidermonkey_tier_1'],
# if true, this branch will get bundled and uploaded to ftp.m.o for users
# to download and thereby accelerate their cloning
'enable_weekly_bundle': False,
'hash_type': 'sha512',
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'create_partial_l10n': False,
'l10n_modules': [
'browser',
'dom',
'extensions/reporter',
'extensions/spellcheck',
'netwerk',
@@ -418,17 +418,17 @@ PLATFORM_VARS = {
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'enable_build_analysis': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'test_pretty_names': False,
'l10n_check_test': False,
'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/asan.manifest',
'use_mock': True,
'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': \
['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
@@ -516,17 +516,17 @@ PLATFORM_VARS = {
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'enable_build_analysis': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'test_pretty_names': False,
'l10n_check_test': False,
'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/asan.manifest',
'use_mock': True,
'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': \
['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
@@ -614,17 +614,17 @@ PLATFORM_VARS = {
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
},
'enable_opt_unittests': False,
'enable_checktests': False,
'enable_build_analysis': False,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'test_pretty_names': False,
'l10n_check_test': False,
'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/clang.manifest',
'use_mock': True,
'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': \
['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
@@ -1460,16 +1460,17 @@ PLATFORM_VARS = {
'stage_platform': "android",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'is_mobile_l10n': True,
'l10n_chunks': 5,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+ 'updates_enabled': False,
},
'android-api-9': {
'product_name': 'firefox',
'unittest_platform': 'android-api-9-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 9 %(branch)s',
'mozconfig': 'in_tree',
@@ -1531,16 +1532,17 @@ PLATFORM_VARS = {
'post_upload_include_platform': True,
'is_mobile_l10n': True,
'l10n_chunks': 5,
'multi_locale': True,
'multi_locale_config_platform': 'android',
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'update_platform': 'Android_arm-eabi-gcc3',
+ 'updates_enabled': False,
},
'android-api-11': {
'product_name': 'firefox',
'unittest_platform': 'android-api-11-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 11+ %(branch)s',
'mozconfig': 'in_tree',
@@ -1602,16 +1604,17 @@ PLATFORM_VARS = {
'post_upload_include_platform': True,
'is_mobile_l10n': True,
'l10n_chunks': 5,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'multi_locale_config_platform': 'android',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'update_platform': 'Android_arm-eabi-gcc3',
+ 'updates_enabled': False,
},
'android-armv6': {
'enable_nightly': True,
'product_name': 'firefox',
'unittest_platform': 'android-armv6-opt',
'app_name': 'browser',
'base_name': 'Android 2.3 Armv6 %(branch)s',
'mozconfig': 'android-armv6/%(branch)s/nightly',
@@ -1669,16 +1672,17 @@ PLATFORM_VARS = {
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-armv6",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'is_mobile_l10n': False,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-armv6/releng.manifest',
+ 'updates_enabled': False,
},
'android-x86': {
'product_name': 'firefox',
'unittest_platform': 'android-x86-opt',
'app_name': 'browser',
'base_name': 'Android 4.2 x86 %(branch)s',
'mozconfig': 'android-x86/%(branch)s/nightly',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
@@ -1733,16 +1737,17 @@ PLATFORM_VARS = {
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-x86",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'is_mobile_l10n': False,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
+ 'updates_enabled': False,
},
'android-debug': {
'enable_nightly': False,
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android 2.3 Debug %(branch)s',
'mozconfig': 'android-debug/%(branch)s/nightly',
@@ -1750,17 +1755,17 @@ PLATFORM_VARS = {
'mobile_dir': 'mobile/android',
'enable_xulrunner': False,
'profiled_build': False,
'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 14,
'upload_symbols': True,
'download_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'update_platform': 'Android_arm-eabi-gcc3',
'enable_ccache': True,
'enable_shared_checkouts': True,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
@@ -1799,16 +1804,17 @@ PLATFORM_VARS = {
},
'enable_opt_unittests': False,
'talos_masters': None,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-debug",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+ 'updates_enabled': False,
},
'android-api-9-debug': {
'enable_nightly': False,
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 9 %(branch)s debug',
'mozconfig': 'in_tree',
@@ -1816,17 +1822,17 @@ PLATFORM_VARS = {
'mobile_dir': 'mobile/android',
'enable_xulrunner': False,
'profiled_build': False,
'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 14,
'upload_symbols': True,
'download_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'enable_ccache': True,
'enable_shared_checkouts': True,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
'use_mock': True,
@@ -1864,16 +1870,17 @@ PLATFORM_VARS = {
},
'enable_opt_unittests': False,
'talos_masters': None,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-api-9-debug",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+ 'updates_enabled': False,
},
'android-api-11-debug': {
'enable_nightly': False,
'product_name': 'firefox',
'unittest_platform': 'android-api-11-debug',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 11+ %(branch)s debug',
@@ -1882,17 +1889,17 @@ PLATFORM_VARS = {
'mobile_dir': 'mobile/android',
'enable_xulrunner': False,
'profiled_build': False,
'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
'build_space': 14,
'upload_symbols': True,
'download_symbols': False,
'packageTests': True,
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'slaves': SLAVES['mock'],
'platform_objdir': OBJDIR,
'enable_ccache': True,
'enable_shared_checkouts': True,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
'use_mock': True,
@@ -1930,16 +1937,17 @@ PLATFORM_VARS = {
},
'enable_opt_unittests': False,
'talos_masters': None,
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-api-11-debug",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+ 'updates_enabled': False,
},
}
# Additional fixups for lion
PLATFORM_VARS["macosx64-lion"] = deepcopy(PLATFORM_VARS["macosx64"])
PLATFORM_VARS["macosx64-lion-debug"] = deepcopy(PLATFORM_VARS["macosx64-debug"])
PLATFORM_VARS["macosx64-lion"]["base_name"] = 'OS X 10.7 %(branch)s'
PLATFORM_VARS["macosx64-lion-debug"]["base_name"] = 'OS X 10.7 64-bit %(branch)s leak test'
PLATFORM_VARS["macosx64-lion"]["slaves"] = SLAVES['macosx64-lion']
@@ -2327,32 +2335,30 @@ BRANCHES['mozilla-central']['enUS_binary
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
# 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']['create_snippet'] = True
+BRANCHES['mozilla-central']['updates_enabled'] = True
BRANCHES['mozilla-central']['update_channel'] = 'nightly'
-BRANCHES['mozilla-central']['create_mobile_snippet'] = True
BRANCHES['mozilla-central']['create_partial'] = True
BRANCHES['mozilla-central']['create_partial_l10n'] = True
-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']['enable_blocklist_update'] = True
BRANCHES['mozilla-central']['enable_hsts_update'] = True
BRANCHES['mozilla-central']['enable_hpkp_update'] = True
BRANCHES['mozilla-central']['platforms']['android-armv6']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6'
BRANCHES['mozilla-central']['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86'
+BRANCHES['mozilla-central']['platforms']['android-x86']['updates_enabled'] = True
BRANCHES['mozilla-central']['platforms']['android-api-9']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-9'
+BRANCHES['mozilla-central']['platforms']['android-api-9']['updates_enabled'] = True
BRANCHES['mozilla-central']['platforms']['android-api-11']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-11'
+BRANCHES['mozilla-central']['platforms']['android-api-11']['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']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-armv6']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-9']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-11']['nightly_signing_servers'] = 'nightly-signing'
@@ -2477,34 +2483,32 @@ BRANCHES['mozilla-aurora']['enUS_binaryU
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-aurora'
BRANCHES['mozilla-aurora']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.mozilla-aurora' % (GLOBAL_VARS['hgurl'])
BRANCHES['mozilla-aurora']['enable_multi_locale'] = True
BRANCHES['mozilla-aurora']['upload_mobile_symbols'] = 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-aurora']['create_snippet'] = True
+BRANCHES['mozilla-aurora']['updates_enabled'] = True
BRANCHES['mozilla-aurora']['update_channel'] = 'aurora'
-BRANCHES['mozilla-aurora']['create_mobile_snippet'] = True
BRANCHES['mozilla-aurora']['create_partial'] = True
BRANCHES['mozilla-aurora']['create_partial_l10n'] = True
# use mozilla-aurora-test when disabling updates for merges
-BRANCHES['mozilla-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora'
-BRANCHES['mozilla-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-aurora'
-BRANCHES['mozilla-aurora']['aus2_mobile_base_upload_dir'] = '/opt/aus2/incoming/2/Fennec/mozilla-aurora'
-BRANCHES['mozilla-aurora']['aus2_mobile_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Fennec/mozilla-aurora'
BRANCHES['mozilla-aurora']['enable_blocklist_update'] = True
BRANCHES['mozilla-aurora']['enable_hsts_update'] = True
BRANCHES['mozilla-aurora']['enable_hpkp_update'] = True
BRANCHES['mozilla-aurora']['enable_valgrind'] = False
BRANCHES['mozilla-aurora']['platforms']['android-armv6']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6'
BRANCHES['mozilla-aurora']['platforms']['android-api-9']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-9'
+BRANCHES['mozilla-aurora']['platforms']['android-api-9']['updates_enabled'] = True
BRANCHES['mozilla-aurora']['platforms']['android-api-11']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-11'
+BRANCHES['mozilla-aurora']['platforms']['android-api-11']['updates_enabled'] = True
BRANCHES['mozilla-aurora']['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86'
+BRANCHES['mozilla-aurora']['platforms']['android-x86']['updates_enabled'] = True
# aurora nightlies should use our nightly signing server
BRANCHES['mozilla-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-aurora']['platforms']['win64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-aurora']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
BRANCHES['mozilla-aurora']['enabled_products'] = ['firefox', 'mobile']
@@ -2526,20 +2530,18 @@ BRANCHES['mozilla-esr31']['enable_l10n_o
BRANCHES['mozilla-esr31']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-esr31']['l10n_platforms'] = ['linux', 'linux64', 'win32',
'macosx64']
BRANCHES['mozilla-esr31']['l10nDatedDirs'] = True
BRANCHES['mozilla-esr31']['l10n_tree'] = 'fxesr31'
BRANCHES['mozilla-esr31']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-esr31'
BRANCHES['mozilla-esr31']['enable_nightly'] = True
-BRANCHES['mozilla-esr31']['create_snippet'] = True
+BRANCHES['mozilla-esr31']['updates_enabled'] = True
BRANCHES['mozilla-esr31']['create_partial'] = True
-BRANCHES['mozilla-esr31']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-esr31'
-BRANCHES['mozilla-esr31']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-esr31'
BRANCHES['mozilla-esr31']['enable_blocklist_update'] = True
BRANCHES['mozilla-esr31']['enable_hsts_update'] = True
BRANCHES['mozilla-esr31']['enable_valgrind'] = False
BRANCHES['mozilla-esr31']['enabled_products'] = ['firefox', 'mobile']
######## mozilla-b2g30_v1_4
BRANCHES['mozilla-b2g30_v1_4']['repo_path'] = 'releases/mozilla-b2g30_v1_4'
BRANCHES['mozilla-b2g30_v1_4']['update_channel'] = 'nightly-b2g30'
@@ -2557,20 +2559,17 @@ BRANCHES['mozilla-b2g30_v1_4']['enable_l
BRANCHES['mozilla-b2g30_v1_4']['enable_l10n_onchange'] = False
BRANCHES['mozilla-b2g30_v1_4']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-b2g30_v1_4']['l10n_platforms'] = ['linux', 'linux64', 'win32',
'macosx64']
BRANCHES['mozilla-b2g30_v1_4']['l10nDatedDirs'] = True
BRANCHES['mozilla-b2g30_v1_4']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g30_v1_4'
BRANCHES['mozilla-b2g30_v1_4']['enable_nightly'] = False
-BRANCHES['mozilla-b2g30_v1_4']['create_snippet'] = False
BRANCHES['mozilla-b2g30_v1_4']['create_partial'] = False
-BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g30_v1_4'
-BRANCHES['mozilla-b2g30_v1_4']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g30_v1_4'
BRANCHES['mozilla-b2g30_v1_4']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g30_v1_4']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g30_v1_4']['enable_hpkp_update'] = False
BRANCHES['mozilla-b2g30_v1_4']['enable_valgrind'] = False
BRANCHES['mozilla-b2g30_v1_4']['enabled_products'] = ['firefox', 'mobile']
######## mozilla-b2g32_v2_0
BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = 'releases/mozilla-b2g32_v2_0'
@@ -2589,20 +2588,17 @@ BRANCHES['mozilla-b2g32_v2_0']['enable_l
BRANCHES['mozilla-b2g32_v2_0']['enable_l10n_onchange'] = False
BRANCHES['mozilla-b2g32_v2_0']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-b2g32_v2_0']['l10n_platforms'] = ['linux', 'linux64', 'win32',
'macosx64']
BRANCHES['mozilla-b2g32_v2_0']['l10nDatedDirs'] = True
BRANCHES['mozilla-b2g32_v2_0']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g32_v2_0'
BRANCHES['mozilla-b2g32_v2_0']['enable_nightly'] = False
-BRANCHES['mozilla-b2g32_v2_0']['create_snippet'] = False
BRANCHES['mozilla-b2g32_v2_0']['create_partial'] = False
-BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g32_v2_0'
-BRANCHES['mozilla-b2g32_v2_0']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g32_v2_0'
BRANCHES['mozilla-b2g32_v2_0']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g32_v2_0']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g32_v2_0']['enable_hpkp_update'] = True
BRANCHES['mozilla-b2g32_v2_0']['enable_valgrind'] = False
BRANCHES['mozilla-b2g32_v2_0']['enabled_products'] = ['firefox', 'mobile']
######## mozilla-b2g34_v2_1
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = 'releases/mozilla-b2g34_v2_1'
@@ -2621,20 +2617,17 @@ BRANCHES['mozilla-b2g34_v2_1']['enable_l
BRANCHES['mozilla-b2g34_v2_1']['enable_l10n_onchange'] = False
BRANCHES['mozilla-b2g34_v2_1']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-b2g34_v2_1']['l10n_platforms'] = ['linux', 'linux64',
'win32', 'macosx64']
BRANCHES['mozilla-b2g34_v2_1']['l10nDatedDirs'] = True
BRANCHES['mozilla-b2g34_v2_1']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['enable_nightly'] = False
-BRANCHES['mozilla-b2g34_v2_1']['create_snippet'] = False
BRANCHES['mozilla-b2g34_v2_1']['create_partial'] = False
-BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1'
-BRANCHES['mozilla-b2g34_v2_1']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1'
BRANCHES['mozilla-b2g34_v2_1']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g34_v2_1']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g34_v2_1']['enable_hpkp_update'] = True
BRANCHES['mozilla-b2g34_v2_1']['enable_valgrind'] = False
BRANCHES['mozilla-b2g34_v2_1']['enabled_products'] = ['firefox', 'mobile']
######## mozilla-b2g34_v2_1s
BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = 'releases/mozilla-b2g34_v2_1s'
@@ -2652,20 +2645,17 @@ BRANCHES['mozilla-b2g34_v2_1s']['unittes
BRANCHES['mozilla-b2g34_v2_1s']['enable_l10n'] = False
BRANCHES['mozilla-b2g34_v2_1s']['enable_l10n_onchange'] = False
BRANCHES['mozilla-b2g34_v2_1s']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-b2g34_v2_1s']['l10n_platforms'] = ['linux']
BRANCHES['mozilla-b2g34_v2_1s']['l10nDatedDirs'] = True
BRANCHES['mozilla-b2g34_v2_1s']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g34_v2_1s'
BRANCHES['mozilla-b2g34_v2_1s']['enable_nightly'] = False
-BRANCHES['mozilla-b2g34_v2_1s']['create_snippet'] = False
BRANCHES['mozilla-b2g34_v2_1s']['create_partial'] = False
-BRANCHES['mozilla-b2g34_v2_1s']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1s'
-BRANCHES['mozilla-b2g34_v2_1s']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g34_v2_1s'
BRANCHES['mozilla-b2g34_v2_1s']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g34_v2_1s']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g34_v2_1s']['enable_hpkp_update'] = True
BRANCHES['mozilla-b2g34_v2_1s']['enable_valgrind'] = False
BRANCHES['mozilla-b2g34_v2_1s']['enabled_products'] = ['firefox', 'mobile']
######## mozilla-b2g37_v2_2
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = 'releases/mozilla-b2g37_v2_2'
@@ -2684,20 +2674,17 @@ BRANCHES['mozilla-b2g37_v2_2']['enable_l
BRANCHES['mozilla-b2g37_v2_2']['enable_l10n_onchange'] = False
BRANCHES['mozilla-b2g37_v2_2']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-b2g37_v2_2']['l10n_platforms'] = ['linux', 'linux64',
'win32', 'macosx64']
BRANCHES['mozilla-b2g37_v2_2']['l10nDatedDirs'] = True
BRANCHES['mozilla-b2g37_v2_2']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g37_v2_2'
BRANCHES['mozilla-b2g37_v2_2']['enable_nightly'] = False
-BRANCHES['mozilla-b2g37_v2_2']['create_snippet'] = False
BRANCHES['mozilla-b2g37_v2_2']['create_partial'] = False
-BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g37_v2_2'
-BRANCHES['mozilla-b2g37_v2_2']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-b2g37_v2_2'
BRANCHES['mozilla-b2g37_v2_2']['enable_blocklist_update'] = False
BRANCHES['mozilla-b2g37_v2_2']['enable_hsts_update'] = True
BRANCHES['mozilla-b2g37_v2_2']['enable_hpkp_update'] = True
BRANCHES['mozilla-b2g37_v2_2']['enable_valgrind'] = False
BRANCHES['mozilla-b2g37_v2_2']['enabled_products'] = ['firefox', 'mobile']
######## try
@@ -2722,19 +2709,17 @@ BRANCHES['try']['enable_nightly'] = Fals
# Disable XULRunner / SDK builds
BRANCHES['try']['enable_xulrunner'] = False
BRANCHES['try']['enable_mac_a11y'] = True
# only do unittests locally until they are switched over to talos-r3
BRANCHES['try']['enable_l10n'] = False
BRANCHES['try']['enable_l10n_onchange'] = False
BRANCHES['try']['l10nNightlyUpdate'] = False
BRANCHES['try']['l10nDatedDirs'] = False
-BRANCHES['try']['create_snippet'] = False
# need this or the master.cfg will bail
-BRANCHES['try']['aus2_base_upload_dir'] = 'fake'
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']
@@ -2794,27 +2779,20 @@ for branch in ACTIVE_PROJECT_BRANCHES:
# Enable unit tests
BRANCHES[branch]['enable_mac_a11y'] = branchConfig.get('enable_mac_a11y', True)
BRANCHES[branch]['unittest_build_space'] = branchConfig.get('unittest_build_space', 6)
# L10n configuration is not set up for project_branches
BRANCHES[branch]['enable_l10n'] = branchConfig.get('enable_l10n', False)
BRANCHES[branch]['l10nNightlyUpdate'] = branchConfig.get('l10nNightlyUpdate', False)
BRANCHES[branch]['l10nDatedDirs'] = branchConfig.get('l10nDatedDirs', False)
# nightly updates
- BRANCHES[branch]['create_snippet'] = branchConfig.get('create_snippet', False)
+ BRANCHES[branch]['updates_enabled'] = branchConfig.get('updates_enabled', False)
BRANCHES[branch]['update_channel'] = branchConfig.get('update_channel', 'nightly-%s' % branch)
BRANCHES[branch]['create_partial'] = branchConfig.get('create_partial', False)
BRANCHES[branch]['create_partial_l10n'] = branchConfig.get('create_partial_l10n', False)
- BRANCHES[branch]['create_mobile_snippet'] = branchConfig.get('create_mobile_snippet', False)
- BRANCHES[branch]['aus2_user'] = branchConfig.get('aus2_user', GLOBAL_VARS['aus2_user'])
- BRANCHES[branch]['aus2_ssh_key'] = branchConfig.get('aus2_ssh_key', GLOBAL_VARS['aus2_ssh_key'])
- BRANCHES[branch]['aus2_base_upload_dir'] = branchConfig.get('aus2_base_upload_dir', '/opt/aus2/incoming/2/Firefox/' + branch)
- BRANCHES[branch]['aus2_base_upload_dir_l10n'] = branchConfig.get('aus2_base_upload_dir_l10n', '/opt/aus2/incoming/2/Firefox/' + branch)
- BRANCHES[branch]['aus2_mobile_base_upload_dir'] = branchConfig.get('aus2_mobile_base_upload_dir', '/opt/aus2/incoming/2/Fennec/' + branch)
- BRANCHES[branch]['aus2_mobile_base_upload_dir_l10n'] = branchConfig.get('aus2_mobile_base_upload_dir_l10n', '/opt/aus2/incoming/2/Fennec/' + branch)
#make sure it has an ending slash
BRANCHES[branch]['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/firefox/nightly/latest-' + branch + '-l10n/'
BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
if 'linux' in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms']['linux']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
if 'android' in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms']['android']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -27,19 +27,16 @@ TRY_SLAVES = {
'mock': TRY_LINUX64_EC2,
}
# Local overrides for default values
GLOBAL_VARS = {
'config_repo_path': 'build/buildbot-configs',
'buildbotcustom_repo_path': 'build/buildbotcustom',
'stage_server': 'stage.mozilla.org',
- 'aus2_host': 'aus3-staging.mozilla.org',
- 'aus2_user': 'ffxbld',
- 'aus2_ssh_key': 'ffxbld_rsa',
'download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/mobile',
'graph_server': 'graphs.mozilla.org',
'balrog_api_root': 'https://aus4-admin.mozilla.org/api',
'balrog_username': 'ffxbld',
'build_tools_repo_path': 'build/tools',
'base_clobber_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
'disable_tinderbox_mail': True,--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -63,17 +63,17 @@ PROJECT_BRANCHES = {
'build_branch': 'UX',
'tinderbox_tree': 'UX',
'mobile_tinderbox_tree': 'UX',
'packaged_unittest_tinderbox_tree': 'UX',
'enabled_products': ['firefox'],
'enable_weekly_bundle': True,
'mozconfig_dir': 'ux',
'enable_nightly': True,
- 'create_snippet': True,
+ 'updates_enabled': True,
'create_partial': True,
'enable_talos': False,
'lock_platforms': True,
'platforms': {
'macosx64': {
'nightly_signing_servers': 'nightly-signing',
},
'linux': {
@@ -153,17 +153,17 @@ PROJECT_BRANCHES = {
'linux64-debug': {},
},
},
'fig': {},
'gum': {
'gecko_version': 35,
'enable_perproduct_builds': False,
'enable_nightly': True,
- 'create_snippet': True,
+ 'updates_enabled': True,
'create_partial': True,
'nightly_signing_servers': 'nightly-signing',
'l10n_repo_path': 'releases/l10n/mozilla-aurora',
'pgo_strategy': 'per-checkin',
'enable_mac_a11y': True,
'enable_l10n': True,
'enable_l10n_onchange': False,
'enUS_binaryURL': '/nightly/latest-gum',
@@ -207,24 +207,24 @@ PROJECT_BRANCHES = {
'android-api-9-debug': {},
'android-api-11-debug': {},
'android-x86': {},
'android-debug': {},
},
},
'maple': {
'enable_nightly': True,
- 'create_snippet': True,
+ 'updates_enabled': True,
'create_partial': True,
'nightly_signing_servers': 'nightly-signing',
},
# customizations for integration work for bugs 481815 and 307181
'oak': {
'enable_nightly': True,
- 'create_snippet': True,
+ 'updates_enabled': True,
'create_partial': True,
'enable_talos': False,
'platforms': {
'linux': {
'nightly_signing_servers': 'nightly-signing',
},
'linux64': {
'nightly_signing_servers': 'nightly-signing',--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -14,19 +14,16 @@ WIN64_RELOPS = ['ix-mn-w0864-%03d' %
SLAVES['win64-rev2'].extend(WIN64_RELOPS)
TRY_SLAVES['win64-rev2'].extend(WIN64_RELOPS)
GLOBAL_VARS = {
'staging': True,
'config_repo_path': 'users/stage-ffxbld/buildbot-configs',
'buildbotcustom_repo_path': 'users/stage-ffxbld/buildbotcustom',
'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
- 'aus2_host': 'dev-stage01.srv.releng.scl3.mozilla.com',
- 'aus2_user': 'ffxbld',
- 'aus2_ssh_key': 'ffxbld_rsa',
'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/mobile',
'graph_server': 'graphs.allizom.org',
'balrog_api_root': 'https://aus4-admin-dev.allizom.org/api',
'balrog_username': 'stage-ffxbld',
'build_tools_repo_path': 'users/stage-ffxbld/tools',
'base_clobber_url': 'https://api-pub-build.allizom.org/clobberer/lastclobber',
'disable_tinderbox_mail': True,--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -1,27 +1,26 @@
from copy import deepcopy
-from os import uname
from config import GLOBAL_VARS, PLATFORM_VARS
import thunderbird_project_branches
reload(thunderbird_project_branches)
from thunderbird_project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
# Note that thunderbird_localconfig.py is symlinked to one of: {production,staging}_thunderbird_config.py
import thunderbird_localconfig
reload(thunderbird_localconfig)
# Can't reload this one because it gets reloaded in another file
from localconfig import SLAVES, TRY_SLAVES
import master_common
reload(master_common)
-from master_common import setMainCommVersions, items_before
+from master_common import setMainCommVersions
GLOBAL_VARS = deepcopy(GLOBAL_VARS)
PLATFORM_VARS = deepcopy(PLATFORM_VARS)
GLOBAL_VARS['objdir'] = 'obj-tb'
GLOBAL_VARS['stage_username'] = 'tbirdbld'
GLOBAL_VARS['stage_ssh_key'] = 'tbirdbld_dsa'
# etc.
@@ -73,17 +72,17 @@ GLOBAL_VARS.update({
'enable_valgrind': False,
'valgrind_platforms': ('linux', 'linux64'),
# if true, this branch will get bundled and uploaded to ftp.m.o for users
# to download and thereby accelerate their cloning
'enable_weekly_bundle': False,
'hash_type': 'sha512',
- 'create_snippet': False,
+ 'updates_enabled': False,
'create_partial': False,
'create_partial_l10n': False,
'l10n_modules': [
'mail',
'editor',
'other-licenses/branding/thunderbird',
'netwerk',
'dom',
@@ -758,22 +757,20 @@ BRANCHES['comm-central']['l10nUploadPath
BRANCHES['comm-central']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-central'
BRANCHES['comm-central']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-central' % (GLOBAL_VARS['hgurl'])
BRANCHES['comm-central']['enable_multi_locale'] = 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['comm-central']['create_snippet'] = True
+BRANCHES['comm-central']['updates_enabled'] = True
BRANCHES['comm-central']['update_channel'] = 'nightly'
BRANCHES['comm-central']['create_partial'] = True
BRANCHES['comm-central']['create_partial_l10n'] = True
-BRANCHES['comm-central']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-central'
-BRANCHES['comm-central']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-central'
BRANCHES['comm-central']['enable_blocklist_update'] = True
BRANCHES['comm-central']['file_update_on_closed_tree'] = False
BRANCHES['comm-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-central']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
######## comm-esr31
@@ -799,20 +796,18 @@ BRANCHES['comm-esr31']['l10n_platforms']
'macosx64']
BRANCHES['comm-esr31']['l10nDatedDirs'] = True
BRANCHES['comm-esr31']['l10n_tree'] = 'tbrel'
BRANCHES['comm-esr31']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr31'
BRANCHES['comm-esr31']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr31' % (GLOBAL_VARS['hgurl'])
BRANCHES['comm-esr31']['enable_nightly'] = True
-BRANCHES['comm-esr31']['create_snippet'] = True
+BRANCHES['comm-esr31']['updates_enabled'] = True
BRANCHES['comm-esr31']['create_partial'] = True
-BRANCHES['comm-esr31']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr31'
-BRANCHES['comm-esr31']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr31'
BRANCHES['comm-esr31']['enable_blocklist_update'] = False
BRANCHES['comm-esr31']['file_update_on_closed_tree'] = False
BRANCHES['comm-esr31']['enable_valgrind'] = False
######## comm-beta
BRANCHES['comm-beta']['moz_repo_path'] = 'releases/mozilla-beta'
BRANCHES['comm-beta']['skip_blank_repos'] = True
BRANCHES['comm-beta']['call_client_py'] = True
@@ -879,23 +874,21 @@ BRANCHES['comm-aurora']['l10nUploadPath'
BRANCHES['comm-aurora']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-aurora'
BRANCHES['comm-aurora']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-aurora' % (GLOBAL_VARS['hgurl'])
BRANCHES['comm-aurora']['enable_multi_locale'] = 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['comm-aurora']['create_snippet'] = True
+BRANCHES['comm-aurora']['updates_enabled'] = True
BRANCHES['comm-aurora']['update_channel'] = 'aurora'
BRANCHES['comm-aurora']['create_partial'] = True
BRANCHES['comm-aurora']['create_partial_l10n'] = True
# use comm-aurora-test when disabling updates for merges
-BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
-BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
BRANCHES['comm-aurora']['enable_blocklist_update'] = True
BRANCHES['comm-aurora']['file_update_on_closed_tree'] = False
BRANCHES['comm-aurora']['enable_valgrind'] = False
BRANCHES['comm-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['comm-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
@@ -917,19 +910,17 @@ BRANCHES['try-comm-central']['enable_nig
# Disable XULRunner / SDK builds
BRANCHES['try-comm-central']['enable_xulrunner'] = False
BRANCHES['try-comm-central']['enable_mac_a11y'] = True
# only do unittests locally until they are switched over to talos-r3
BRANCHES['try-comm-central']['enable_l10n'] = False
BRANCHES['try-comm-central']['enable_l10n_onchange'] = False
BRANCHES['try-comm-central']['l10nNightlyUpdate'] = False
BRANCHES['try-comm-central']['l10nDatedDirs'] = False
-BRANCHES['try-comm-central']['create_snippet'] = False
# need this or the master.cfg will bail
-BRANCHES['try-comm-central']['aus2_base_upload_dir'] = 'fake'
BRANCHES['try-comm-central']['platforms']['linux']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try-comm-central']['platforms']['linux64']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try-comm-central']['platforms']['win32']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try-comm-central']['platforms']['macosx64']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try-comm-central']['platforms']['linux-debug']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try-comm-central']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try-comm-central']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try-comm-central']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
@@ -962,25 +953,20 @@ for branch in ACTIVE_PROJECT_BRANCHES:
# Enable unit tests
BRANCHES[branch]['enable_mac_a11y'] = branchConfig.get('enable_mac_a11y', True)
BRANCHES[branch]['unittest_build_space'] = branchConfig.get('unittest_build_space', 6)
# L10n configuration is not set up for project_branches
BRANCHES[branch]['enable_l10n'] = branchConfig.get('enable_l10n', False)
BRANCHES[branch]['l10nNightlyUpdate'] = branchConfig.get('l10nNightlyUpdate', False)
BRANCHES[branch]['l10nDatedDirs'] = branchConfig.get('l10nDatedDirs', False)
# nightly updates
- BRANCHES[branch]['create_snippet'] = branchConfig.get('create_snippet', False)
+ BRANCHES[branch]['updates_enabled'] = branchConfig.get('updates_enabled', False)
BRANCHES[branch]['update_channel'] = branchConfig.get('update_channel', 'nightly-%s' % branch)
BRANCHES[branch]['create_partial'] = branchConfig.get('create_partial', False)
BRANCHES[branch]['create_partial_l10n'] = branchConfig.get('create_partial_l10n', False)
- BRANCHES[branch]['create_mobile_snippet'] = branchConfig.get('create_mobile_snippet', False)
- BRANCHES[branch]['aus2_user'] = branchConfig.get('aus2_user', GLOBAL_VARS['aus2_user'])
- BRANCHES[branch]['aus2_ssh_key'] = branchConfig.get('aus2_ssh_key', GLOBAL_VARS['aus2_ssh_key'])
- BRANCHES[branch]['aus2_base_upload_dir'] = branchConfig.get('aus2_base_upload_dir', '/opt/aus2/incoming/2/Thunderbird/' + branch)
- BRANCHES[branch]['aus2_base_upload_dir_l10n'] = branchConfig.get('aus2_base_upload_dir_l10n', '/opt/aus2/incoming/2/Thunderbird/' + branch) #make sure it has an ending slash
BRANCHES[branch]['l10nUploadPath'] = \
'/home/ftp/pub/mozilla.org/thunderbird/nightly/latest-' + branch + '-l10n/'
BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
if 'linux' in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms']['linux']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
if 'linux64' in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms']['linux64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'linux64-' + branch
if 'win32' in BRANCHES[branch]['platforms']:--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -32,19 +32,16 @@ GLOBAL_VARS['talos_masters'] = []
# and sendchange retry count before give up
GLOBAL_VARS['unittest_masters'] = [
('buildbot-master81.build.mozilla.org:9301', True, 5),
]
GLOBAL_VARS['xulrunner_tinderbox_tree'] = None
GLOBAL_VARS['weekly_tinderbox_tree'] = 'Thunderbird'
GLOBAL_VARS['l10n_tinderbox_tree'] = 'Mozilla-l10n'
GLOBAL_VARS['base_bundle_urls'] = ['https://ftp-ssl.mozilla.org/pub/mozilla.org/thunderbird/bundles']
-GLOBAL_VARS['aus2_user'] = 'tbirdbld'
-GLOBAL_VARS['aus2_ssh_key'] = 'tbirdbld_dsa'
-GLOBAL_VARS['aus2_host'] = 'aus3-staging.mozilla.org'
# Local branch overrides
BRANCHES = {
'comm-central': {
'packaged_unittest_tinderbox_tree': 'Thunderbird',
'tinderbox_tree': 'Thunderbird',
},
'comm-esr31': {--- a/mozilla/thunderbird_staging_config.py
+++ b/mozilla/thunderbird_staging_config.py
@@ -1,19 +1,16 @@
from localconfig import SLAVES
GLOBAL_VARS = {
'staging': True,
'config_repo_path': 'build/buildbot-configs',
'buildbotcustom_repo_path': 'build/buildbotcustom',
'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
'balrog_username': 'stage-tbirdbld',
- 'aus2_user': 'tbirdbld',
- 'aus2_ssh_key': 'tbirdbld_dsa',
- 'aus2_host': 'dev-stage01.srv.releng.scl3.mozilla.com',
'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
'graph_server': 'graphs.allizom.org',
'build_tools_repo_path': 'build/tools',
'base_clobber_url': 'https://api-pub-build.allizom.org/clobberer/lastclobber',
'disable_tinderbox_mail': True,
'talos_masters': [],
# List of unittest masters to notify of new builds to test,
# if a failure to notify the master should result in a warning,