--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -27,20 +27,16 @@ GLOBAL_VARS.update({
'linux64_gecko': {},
'linux64_gecko-debug': {},
'macosx64_gecko': {},
'macosx64_gecko-debug': {},
'macosx64-mulet': {},
'win32_gecko': {},
'win32_gecko-debug': {},
'win32-mulet': {},
- 'linux32_gecko_localizer': {},
- 'linux64_gecko_localizer': {},
- 'macosx64_gecko_localizer': {},
- 'win32_gecko_localizer': {},
'nexus-4': {},
'nexus-4_eng': {},
'nexus-5-l': {},
'nexus-5-l_eng': {},
'emulator': {},
'emulator-debug': {},
'emulator-jb': {},
'emulator-jb-debug': {},
@@ -709,115 +705,16 @@ PLATFORM_VARS = {
'--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'],
},
- '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,
- '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': [],
- 'stage_product': 'b2g',
- 'stage_platform': 'linux32_gecko_localizer',
- 'update_platform': 'Linux_x86-gcc3',
- 'enable_ccache': True,
- 'enable_shared_checkouts': True,
- 'env': {
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'TOOLTOOL_CACHE': '/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/builds',
- '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': "/home/cltbld/.ssh/ffxbld_rsa",
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_COMPRESS': '1',
- 'CCACHE_UMASK': '002',
- 'LC_ALL': 'C',
- 'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:${PATH}:/tools/buildbot/bin',
- # Necessary to avoid conflicting with the dev-focused builds'
- # filenames
- 'MOZ_PKG_SPECIAL': 'localizer',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': False,
- 'enable_build_analysis': True,
- 'test_pretty_names': False,
- 'l10n_check_test': False,
- 'use_mock': True,
- 'mock_target': 'mozilla-centos6-x86_64',
- 'mock_packages': ['autoconf213', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
- 'glibc-static.i686', 'libstdc++-static.i686', 'perl-Test-Simple',
- 'perl-Config-General', 'gtk2-devel.i686', 'libnotify-devel.i686',
- 'yasm', 'alsa-lib-devel.i686', 'libcurl-devel.i686', 'wireless-tools-devel.i686',
- 'libX11-devel.i686', 'libXt-devel.i686', 'mesa-libGL-devel.i686',
- 'gnome-vfs2-devel.i686', 'mpfr', 'xorg-x11-font',
- 'imake', 'ccache', 'wget',
- 'gcc472_0moz1', 'gcc473_0moz1',
- 'freetype-2.3.11-6.el6_1.8.i686', 'freetype-devel-2.3.11-6.el6_1.8.i686',
- 'freetype-2.3.11-6.el6_1.8.x86_64',
- 'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
- # Packages already installed in the mock environment, as x86_64
- # packages.
- 'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
- # yum likes to install .x86_64 -devel packages that satisfy .i686
- # -devel packages dependencies. So manually install the dependencies
- # of the above packages.
- 'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
- 'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
- 'fontconfig-devel.i686', 'glib2-devel.i686',
- 'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
- 'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
- 'libXcursor-devel.i686', 'libXdamage-devel.i686', 'libXdmcp-devel.i686',
- 'libXext-devel.i686', 'libXfixes-devel.i686', 'libXft-devel.i686',
- 'libXi-devel.i686', 'libXinerama-devel.i686', 'libXrandr-devel.i686',
- 'libXrender-devel.i686', 'libXxf86vm-devel.i686', 'libdrm-devel.i686',
- 'libidn-devel.i686', 'libpng-devel.i686', 'libxcb-devel.i686',
- 'libxml2-devel.i686', 'pango-devel.i686', 'perl-devel.i686',
- 'pixman-devel.i686', 'zlib-devel.i686',
- # Packages necessary to run host xpcshell
- 'libXt.x86_64',
- ],
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/linux32/releng.manifest',
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_all.json',
- 'mock_copyin_files': [
- ('/home/cltbld/.hgrc', '/builds/.hgrc'),
- ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
- ('/home/cltbld/.boto', '/builds/.boto'),
- ],
- 'multi_locale': True,
- 'multi_config_name': 'multi_locale/b2g_linux32.py',
- 'mozharness_multi_options': [
- '--build',
- '--summary',
- '--gecko-languages-file', 'build/b2g/locales/all-locales',
- ],
- 'gecko_languages_file': 'build/b2g/locales/all-locales',
- },
'win32-mulet': {
'product_name': 'firefox',
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_32_builds.py',
'--custom-build-variant-cfg', 'mulet',
@@ -864,205 +761,16 @@ PLATFORM_VARS = {
'enable_checktests': True,
'talos_masters': None,
'test_pretty_names': False,
'l10n_check_test': False,
'multi_locale': False,
'tooltool_manifest_src': 'b2g/dev/config/tooltool-manifests/win32/releng.manifest',
'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
},
- '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,
- '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': [],
- 'stage_product': 'b2g',
- 'stage_platform': 'linux64_gecko_localizer',
- 'update_platform': 'Linux_x86_64-gcc3',
- 'enable_ccache': True,
- 'enable_shared_checkouts': True,
- 'env': {
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'TOOLTOOL_CACHE': '/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/builds',
- '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': "/home/cltbld/.ssh/ffxbld_rsa",
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_COMPRESS': '1',
- 'CCACHE_UMASK': '002',
- 'LC_ALL': 'C',
- 'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:${PATH}:/tools/buildbot/bin',
- # Necessary to avoid conflicting with the dev-focused builds'
- # filenames
- 'MOZ_PKG_SPECIAL': 'localizer',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': False,
- 'enable_build_analysis': True,
- 'test_pretty_names': False,
- 'l10n_check_test': False,
- 'use_mock': True,
- 'mock_target': 'mozilla-centos6-x86_64',
- 'mock_packages': ['autoconf213', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
- 'glibc-static', 'libstdc++-static', 'gtk2-devel',
- 'libnotify-devel', 'yasm', 'alsa-lib-devel',
- 'libcurl-devel', 'wireless-tools-devel',
- 'libX11-devel', 'libXt-devel', 'mesa-libGL-devel',
- 'gnome-vfs2-devel', 'mpfr', 'xorg-x11-font',
- 'imake', 'ccache', 'wget',
- 'freetype-2.3.11-6.el6_2.9', 'freetype-devel-2.3.11-6.el6_2.9',
- 'gstreamer-devel', 'gstreamer-plugins-base-devel',
- 'gcc472_0moz1', 'gcc473_0moz1'],
- 'tooltool_manifest_src': 'b2g/config/tooltool-manifests/linux64/releng.manifest',
- 'gaia_repo': gaia_repo,
- 'gaia_revision_file': gaia_revision_file,
- 'gaia_languages_file': 'locales/languages_all.json',
- 'mock_copyin_files': [
- ('/home/cltbld/.hgrc', '/builds/.hgrc'),
- ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
- ('/home/cltbld/.boto', '/builds/.boto'),
- ],
- 'multi_locale': True,
- '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_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,
- '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': [],
- 'stage_product': 'b2g',
- 'stage_platform': 'macosx64_gecko_localizer',
- '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:${PATH}',
- # Necessary to avoid conflicting with the dev-focused builds'
- # filenames
- 'MOZ_PKG_SPECIAL': 'localizer',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': False,
- '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_all.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_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/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,
- '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,
- '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}",
- # Necessary to avoid conflicting with the dev-focused builds'
- # filenames
- 'MOZ_PKG_SPECIAL': 'localizer',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': False,
- '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_all.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',