--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -17,20 +17,16 @@ from master_common import items_before,
GLOBAL_VARS = deepcopy(GLOBAL_VARS)
PLATFORM_VARS = deepcopy(PLATFORM_VARS)
GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
GLOBAL_VARS.update({
'platforms': {
- 'macosx64_gecko': {},
- 'macosx64_gecko-debug': {},
- 'win32_gecko': {},
- 'win32_gecko-debug': {},
'linux64-b2g-haz': {},
'nexus-4': {},
'nexus-4_eng': {},
'nexus-5-l': {},
'nexus-5-l_eng': {},
'emulator': {},
'emulator-debug': {},
'flame-kk': {},
@@ -211,258 +207,16 @@ PLATFORM_VARS = {
'multi_config_name': 'multi_locale/b2g_linux64.py',
'mozharness_multi_options': [
'--build',
'--summary',
'--gecko-languages-file', 'build/b2g/locales/all-locales',
],
'gecko_languages_file': 'build/b2g/locales/all-locales',
},
- 'macosx64_gecko': {
- 'product_name': 'b2g',
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': ['--config', 'b2g/desktop_macosx64.py'],
- },
- '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': False,
- 'enable_periodic': True,
- 'profiled_build': 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'],
- 'stage_product': 'b2g',
- 'stage_platform': 'macosx64_gecko',
- 'update_platform': 'Darwin_x86_64-gcc3',
- 'enable_shared_checkouts': True,
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'TOOLTOOL_CACHE': '/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/builds',
- 'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
- 'CHOWN_ROOT': '~/bin/chown_root',
- 'CHOWN_REVERT': '~/bin/chown_revert',
- 'LC_ALL': 'C',
- 'PATH': '/tools/python/bin:/tools/buildbot/bin:${PATH}',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'test_pretty_names': False,
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/macosx64/releng.manifest',
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_dev.json',
- 'multi_locale': True,
- 'multi_config_name': 'multi_locale/b2g_macosx64.py',
- 'mozharness_multi_options': [
- '--build',
- '--summary',
- '--gecko-languages-file', 'build/b2g/locales/all-locales',
- ],
- 'gecko_languages_file': 'build/b2g/locales/all-locales',
- },
- 'macosx64_gecko-debug': {
- 'product_name': 'b2g',
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': [
- '--config', 'b2g/desktop_macosx64.py',
- '--custom-build-variant-cfg', 'b2g-debug',
- ],
- },
- 'app_name': 'b2g',
- '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,
- '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'],
- 'stage_product': 'b2g',
- 'stage_platform': 'macosx64_gecko-debug',
- 'update_platform': 'Darwin_x86_64-gcc3',
- 'enable_shared_checkouts': True,
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
- 'CHOWN_ROOT': '~/bin/chown_root',
- 'CHOWN_REVERT': '~/bin/chown_revert',
- 'LC_ALL': 'C',
- 'PATH': '/tools/python/bin:/tools/buildbot/bin:${PATH}',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'test_pretty_names': False,
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/macosx64/releng.manifest',
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_dev.json',
- 'multi_locale': True,
- 'multi_config_name': 'multi_locale/b2g_macosx64.py',
- 'mozharness_multi_options': [
- '--build',
- '--summary',
- '--gecko-languages-file', 'build/b2g/locales/all-locales',
- ],
- 'gecko_languages_file': 'build/b2g/locales/all-locales',
- },
- 'win32_gecko': {
- 'product_name': 'b2g',
- 'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': ['--config', 'b2g/desktop_windows32.py'],
- },
- 'app_name': 'b2g',
- 'base_name': builder_prefix + '_%(branch)s_%(platform)s',
- 'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
- '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,
- '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,
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
- 'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
- 'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
- 'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'test_pretty_names': False,
- 'l10n_check_test': False,
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_dev.json',
- 'multi_locale': True,
- 'multi_config_name': 'multi_locale/b2g_win32.py',
- 'mozharness_multi_options': [
- '--build',
- '--summary',
- '--gecko-languages-file', 'build/b2g/locales/all-locales',
- ],
- 'gecko_languages_file': 'build/b2g/locales/all-locales',
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/win32/releng.manifest',
- 'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
- },
- 'win32_gecko-debug': {
- 'product_name': 'b2g',
- 'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': [
- '--config', 'b2g/desktop_windows32.py',
- '--custom-build-variant-cfg', 'b2g-debug',
- ],
- },
- 'app_name': 'b2g',
- 'base_name': builder_prefix + '_%(branch)s_%(platform)s',
- 'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/debug',
- 'src_mozconfig': 'b2g/config/mozconfigs/win32_gecko/debug',
- '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,
- '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,
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': b2g_localconfig.SYMBOL_SERVER_HOST,
- 'SYMBOL_SERVER_USER': 'ffxbld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
- 'SYMBOL_SERVER_SSH_KEY': "/c/Users/cltbld/.ssh/ffxbld_rsa",
- 'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
- 'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
- 'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'test_pretty_names': False,
- 'l10n_check_test': False,
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_dev.json',
- 'multi_locale': True,
- 'multi_config_name': 'multi_locale/b2g_win32.py',
- 'mozharness_multi_options': [
- '--build',
- '--summary',
- '--gecko-languages-file', 'build/b2g/locales/all-locales',
- ],
- 'gecko_languages_file': 'build/b2g/locales/all-locales',
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/win32/releng.manifest',
- 'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
- },
'nexus-4': {
'mozharness_config': {
'script_name': 'scripts/b2g_build.py',
# b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
# --target name below
'extra_args': ['--target', 'nexus-4', '--config', 'b2g/releng-private-updates.py',
'--gaia-languages-file', 'locales/languages_dev.json',
'--gecko-languages-file', 'gecko/b2g/locales/all-locales',
@@ -1097,20 +851,16 @@ BRANCHES = {
'flame-kk': {},
'flame-kk_eng': {},
}
},
'try': {
'lock_platforms': True,
'platforms': {
'linux64-b2g-haz': {},
- 'macosx64_gecko': {},
- 'macosx64_gecko-debug': {},
- 'win32_gecko': {},
- 'win32_gecko-debug': {},
'linux64_graphene': {},
'macosx64_graphene': {},
'win64_graphene': {},
'linux64_horizon': {},
'macosx64_horizon': {},
'win64_horizon': {},
'emulator': {},
'emulator-debug': {},
@@ -1204,18 +954,17 @@ for branch in BRANCHES.keys():
for platform, platform_config in value.items():
if platform_config.get('dont_build'):
del BRANCHES[branch]['platforms'][platform]
######## remove most B2G builds from cedar
for platform in ('nexus-4', 'nexus-4_eng', 'nexus-5-l', 'nexus-5-l_eng',
'flame-kk', 'flame-kk_eng', 'flame-kk_eng-debug',
- 'win32_gecko', 'linux64-b2g-haz', 'win32_gecko-debug',
- 'macosx64_gecko', 'macosx64_gecko-debug'):
+ 'linux64-b2g-haz'):
if platform in BRANCHES['cedar']['platforms']:
del BRANCHES['cedar']['platforms'][platform]
######## mozilla-central
# This is a path, relative to HGURL, where the repository is located
# 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'
@@ -1286,29 +1035,16 @@ BRANCHES['try']['gecko_l10n_root'] = 'ht
BRANCHES['try']['enable_merging'] = False
BRANCHES['try']['enable_try'] = True
BRANCHES['try']['package_dir'] = '%(who)s-%(got_revision)s'
BRANCHES['try']['stage_username'] = 'trybld'
BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
# Disable Nightly builds
BRANCHES['try']['enable_nightly'] = False
BRANCHES['try']['platforms']['linux64-b2g-haz']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['macosx64_gecko']['slaves'] = TRY_SLAVES['macosx64-lion']
-BRANCHES['try']['platforms']['macosx64_gecko-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
-BRANCHES['try']['platforms']['win32_gecko']['slaves'] = TRY_SLAVES['win64-rev2']
-BRANCHES['try']['platforms']['win32_gecko-debug']['slaves'] = TRY_SLAVES['win64-rev2']
-# Make periodic B2G Desktop and Mulet builds dep builds on Try (bug 1127482).
-BRANCHES['try']['platforms']['macosx64_gecko']['enable_dep'] = True
-BRANCHES['try']['platforms']['macosx64_gecko']['enable_periodic'] = False
-BRANCHES['try']['platforms']['macosx64_gecko-debug']['enable_dep'] = True
-BRANCHES['try']['platforms']['macosx64_gecko-debug']['enable_periodic'] = False
-BRANCHES['try']['platforms']['win32_gecko']['enable_dep'] = True
-BRANCHES['try']['platforms']['win32_gecko']['enable_periodic'] = False
-BRANCHES['try']['platforms']['win32_gecko-debug']['enable_dep'] = True
-BRANCHES['try']['platforms']['win32_gecko-debug']['enable_periodic'] = False
BRANCHES['try']['platforms']['linux64_graphene']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['macosx64_graphene']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['win64_graphene']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try']['platforms']['linux64_horizon']['slaves'] = TRY_SLAVES['mock']
BRANCHES['try']['platforms']['macosx64_horizon']['slaves'] = TRY_SLAVES['macosx64-lion']
BRANCHES['try']['platforms']['win64_horizon']['slaves'] = TRY_SLAVES['win64-rev2']
BRANCHES['try']['platforms']['emulator']['slaves'] = TRY_SLAVES['mock']