--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -12,37 +12,23 @@ reload(b2g_localconfig)
import master_common
reload(master_common)
from master_common import setMainFirefoxVersions, items_before, items_at_least
import config_common
reload(config_common)
from config_common import nested_haskey
-# Import WithProperties for gaia-try. Allow for a bogus WithProperties for
-# tools that don't want to have the full buildbot stack.
-try:
- from buildbot.steps.shell import WithProperties
-except ImportError:
- def WithProperties(s):
- return s
-
GLOBAL_VARS = deepcopy(GLOBAL_VARS)
GLOBAL_VARS['stage_username'] = 'ffxbld'
GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
BRANCHES = {
- 'alder': {
- 'lock_platforms': True,
- 'platforms': {
- 'linux32_gecko': {},
- 'linux64_gecko': {},
- },
- },
+ 'alder': {},
'ash': {},
# Not needed right now, see bug 977420
# 'birch': {},
'cedar': {},
'cypress': {},
'jamun': {},
'maple': {},
'pine': {},
@@ -67,51 +53,31 @@ BRANCHES = {
'gecko_version': 37,
'b2g_version': (2, 2, 0),
},
'mozilla-central': {},
'mozilla-inbound': {},
'b2g-inbound': {},
#'services-central': {}, # Bug 1010674
'try': {},
- 'gaia-try': {
- 'lock_platforms': True,
- 'platforms': {
- 'linux32_gecko': {},
- 'linux64_gecko': {},
- 'macosx64_gecko': {},
- },
- },
}
setMainFirefoxVersions(BRANCHES)
PLATFORMS = {
- 'linux32_gecko': {},
'linux64_gecko': {},
'macosx64_gecko': {},
'macosx64-mulet': {},
'emulator': {},
'emulator-jb': {},
'emulator-kk': {},
}
builder_prefix = "b2g"
-PLATFORMS['linux32_gecko']['slave_platforms'] = ['ubuntu32_vm-b2gdt', ]
-PLATFORMS['linux32_gecko']['env_name'] = 'linux-perf'
-PLATFORMS['linux32_gecko']['ubuntu32_vm-b2gdt'] = {'name': builder_prefix + "_ubuntu32_vm"}
-PLATFORMS['linux32_gecko']['stage_product'] = 'b2g'
-PLATFORMS['linux32_gecko']['mozharness_config'] = {
- 'mozharness_python': '/tools/buildbot/bin/python',
- 'use_mozharness': True,
- 'hg_bin': 'hg',
- 'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-}
-
PLATFORMS['linux64_gecko']['slave_platforms'] = ['ubuntu64_vm-b2gdt', ]
PLATFORMS['linux64_gecko']['env_name'] = 'linux-perf'
PLATFORMS['linux64_gecko']['ubuntu64_vm-b2gdt'] = {'name': builder_prefix + "_ubuntu64_vm"}
PLATFORMS['linux64_gecko']['stage_product'] = 'b2g'
PLATFORMS['linux64_gecko']['mozharness_config'] = {
'mozharness_python': '/tools/buildbot/bin/python',
'use_mozharness': True,
'hg_bin': 'hg',
@@ -186,17 +152,16 @@ for platform, platform_config in PLATFOR
platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
else:
platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
BRANCH_UNITTEST_VARS = {
'hghost': 'hg.mozilla.org',
# turn on platforms as we get them running
'platforms': {
- 'linux32_gecko': {},
'linux64_gecko': {},
'macosx64_gecko': {},
'macosx64-mulet': {},
'emulator': {},
'emulator-jb': {},
'emulator-kk': {},
},
}
@@ -1018,115 +983,16 @@ PLATFORM_UNITTEST_VARS = {
'--cfg', 'unittests/mac_unittest.py',
'--total-chunks', 5, '--this-chunk', 5,
'--mochitest-suite', 'plain-chunked',
]
},
},
},
},
- 'linux32_gecko': {
- 'product_name': 'b2g',
- 'app_name': 'b2g',
- 'brand_name': 'Gecko',
- 'builds_before_reboot': 1,
- 'unittest-env': {'DISPLAY': ':0'},
- 'enable_opt_unittests': True,
- 'enable_debug_unittests': False,
- 'ubuntu32_vm-b2gdt': {
- 'opt_unittest_suites': MOCHITEST_DESKTOP[:] + REFTEST_DESKTOP_SANITY[:],
- 'debug_unittest_suites': [],
- 'suite_config': {
- 'mochitest-1': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'mochitest',
- '--this-chunk', 1, '--total-chunks', 1,
- ],
- },
- 'reftest-sanity': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
- ],
- },
- 'reftest-1': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 1, '--total-chunks', 10,
- ],
- },
- 'reftest-2': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 2, '--total-chunks', 10,
- ],
- },
- 'reftest-3': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 3, '--total-chunks', 10,
- ],
- },
- 'reftest-4': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 4, '--total-chunks', 10,
- ],
- },
- 'reftest-5': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 5, '--total-chunks', 10,
- ],
- },
- 'reftest-6': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 6, '--total-chunks', 10,
- ],
- },
- 'reftest-7': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 7, '--total-chunks', 10,
- ],
- },
- 'reftest-8': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 8, '--total-chunks', 10,
- ],
- },
- 'reftest-9': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 9, '--total-chunks', 10,
- ],
- },
- 'reftest-10': {
- 'extra_args': [
- '--cfg', 'b2g/desktop_automation_config.py',
- '--test-suite', 'reftest',
- '--this-chunk', 10, '--total-chunks', 10,
- ],
- },
- },
- },
- },
'linux64_gecko': {
'product_name': 'b2g',
'app_name': 'b2g',
'brand_name': 'Gecko',
'builds_before_reboot': 1,
'unittest-env': {'DISPLAY': ':0'},
'enable_opt_unittests': True,
'enable_debug_unittests': True,
@@ -1136,39 +1002,39 @@ PLATFORM_UNITTEST_VARS = {
'debug_unittest_suites': [],
'suite_config': {
'gaia-integration': {
'extra_args': [
'--cfg', 'b2g/gaia_integration_config.py',
],
},
'gaia-js-integration-1': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 1, '--total-chunks', 10,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 1, '--total-chunks', 10,
+ ],
+ },
'gaia-js-integration-2': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 2, '--total-chunks', 10,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 2, '--total-chunks', 10,
+ ],
+ },
'gaia-js-integration-3': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 3, '--total-chunks', 10,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 3, '--total-chunks', 10,
+ ],
+ },
'gaia-js-integration-4': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 4, '--total-chunks', 10,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 4, '--total-chunks', 10,
+ ],
+ },
'gaia-js-integration-5': {
'extra_args': [
'--cfg', 'b2g/gaia_integration_config.py',
'--this-chunk', 5, '--total-chunks', 10,
],
},
'gaia-js-integration-6': {
'extra_args': [
@@ -1393,39 +1259,39 @@ PLATFORM_UNITTEST_VARS = {
'debug_unittest_suites': [],
'suite_config': {
'gaia-integration': {
'extra_args': [
'--cfg', 'b2g/gaia_integration_config.py',
],
},
'gaia-js-integration-1': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 1, '--total-chunks', 4,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 1, '--total-chunks', 4,
+ ],
+ },
'gaia-js-integration-2': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 2, '--total-chunks', 4,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 2, '--total-chunks', 4,
+ ],
+ },
'gaia-js-integration-3': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 3, '--total-chunks', 4,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 3, '--total-chunks', 4,
+ ],
+ },
'gaia-js-integration-4': {
- 'extra_args': [
- '--cfg', 'b2g/gaia_integration_config.py',
- '--this-chunk', 4, '--total-chunks', 4,
- ],
- },
+ 'extra_args': [
+ '--cfg', 'b2g/gaia_integration_config.py',
+ '--this-chunk', 4, '--total-chunks', 4,
+ ],
+ },
'gaia-ui-test': {
'extra_args': [
'--cfg', 'marionette/gaia_ui_test_prod_config.py',
],
},
'gaia-ui-test-functional-1': {
'extra_args': [
'--cfg', 'marionette/gaia_ui_test_prod_config.py',
@@ -2663,17 +2529,16 @@ BRANCHES['mozilla-b2g34_v2_1']['repo_pat
BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = "releases/mozilla-b2g34_v2_1s"
BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
BRANCHES['mozilla-central']['branch_name'] = "Firefox"
BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
BRANCHES['b2g-inbound']['branch_name'] = "B2g-Inbound"
BRANCHES['b2g-inbound']['repo_path'] = "integration/b2g-inbound"
BRANCHES['try']['pgo_strategy'] = "try"
BRANCHES['try']['enable_try'] = True
-BRANCHES['gaia-try']['repo_path'] = "integration/gaia-try"
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
@@ -2776,56 +2641,17 @@ for b in BRANCHES.keys():
# Disable OSX Mulet in every branch except cedar
for name in BRANCHES.keys():
if name in ('cedar', ):
continue
for platform in ('macosx64-mulet', ):
if platform in BRANCHES[name]['platforms']:
del BRANCHES[name]['platforms'][platform]
-### PROJECTS ###
-PROJECTS = {
- 'gaia-try': {
- 'hgurl': 'https://hg.mozilla.org',
- 'repo_path': 'integration/gaia-try',
- },
-}
-PROJECTS['gaia-try']['platforms'] = deepcopy(BRANCHES['mozilla-central']['platforms'])
-for k, v in localconfig.B2G_PROJECTS.items():
- if k not in PROJECTS:
- PROJECTS[k] = {}
- for k1, v1 in v.items():
- PROJECTS[k][k1] = v1
-mc_gecko_version = BRANCHES['mozilla-central']['gecko_version']
-for pf, pf_config in BRANCHES['gaia-try']['platforms'].items():
- for sp in pf_config['slave_platforms']:
- for suite, suite_config in pf_config[sp]['suite_config'].items():
- suite_config['extra_args'].extend([
- '-c', 'b2g/gaia_try.py',
- ])
- if 'linux32' in pf:
- suite_config['opt_extra_args'] = [
- '-c',
- WithProperties('http://hg.mozilla.org/integration/gaia-try/raw-file/%(revision)s/linux32.json'),
- ]
- elif 'linux64' in pf:
- suite_config['opt_extra_args'] = [
- '-c',
- WithProperties('http://hg.mozilla.org/integration/gaia-try/raw-file/%(revision)s/linux64.json'),
- ]
- suite_config['debug_extra_args'] = [
- '-c',
- WithProperties('http://hg.mozilla.org/integration/gaia-try/raw-file/%(revision)s/linux64-debug.json'),
- ]
- elif 'macosx64' in pf:
- suite_config['opt_extra_args'] = [
- '-c',
- WithProperties('http://hg.mozilla.org/integration/gaia-try/raw-file/%(revision)s/macosx64.json'),
- ]
-
+PROJECTS = {}
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:--- a/mozilla-tests/b2g_production_config.py
+++ b/mozilla-tests/b2g_production_config.py
@@ -18,21 +18,14 @@ BRANCHES = {
'notify_real_author': True,
'enable_merging': False,
'slave_key': 'try_slaves',
'package_url': 'https://ftp-ssl.mozilla.org/pub/mozilla.org/b2g/try-builds',
'package_dir': '%(who)s-%(got_revision)s',
'stage_username': 'trybld',
'stage_ssh_key': 'trybld_dsa',
},
- 'gaia-try': {
- 'enable_merging': False,
- },
}
PLATFORM_VARS = {}
PROJECTS = {}
-B2G_PROJECTS = {
- 'gaia-try': {
- 'scripts_repo': 'https://hg.mozilla.org/build/mozharness',
- },
-}
+B2G_PROJECTS = {}--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -17,18 +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': {
- 'linux32_gecko': {},
- 'linux32_gecko-debug': {},
'linux64_gecko': {},
'linux64_gecko-debug': {},
'macosx64_gecko': {},
'macosx64_gecko-debug': {},
'macosx64-mulet': {},
'win32_gecko': {},
'win32_gecko-debug': {},
'win32-mulet': {},
@@ -82,214 +80,16 @@ gaia_revision_file = 'b2g/config/gaia.js
GLOBAL_ENV = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'TINDERBOX_OUTPUT': '1',
'MOZ_AUTOMATION': '1',
}
PLATFORM_VARS = {
- 'linux32_gecko': {
- '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,
- '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'],
- 'stage_product': 'b2g',
- 'stage_platform': 'linux32_gecko',
- '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',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- '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_dev.json',
- 'mock_copyin_files': [
- ('/home/cltbld/.hgrc', '/builds/.hgrc'),
- ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
- ('/home/cltbld/.boto', '/builds/.boto'),
- ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
- ],
- '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',
- },
- 'linux32_gecko-debug': {
- 'product_name': 'b2g',
- 'app_name': 'b2g',
- '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,
- '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'],
- 'stage_product': 'b2g',
- 'stage_platform': 'linux32_gecko-debug',
- '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',
- 'WGET_OPTS': '-q -c',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- '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_dev.json',
- 'mock_copyin_files': [
- ('/home/cltbld/.hgrc', '/builds/.hgrc'),
- ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
- ('/home/cltbld/.boto', '/builds/.boto'),
- ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
- ],
- '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',
- },
'linux64_gecko': {
'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,
@@ -1371,20 +1171,16 @@ BRANCHES = {
},
'mozilla-b2g37_v2_2': {
'gecko_version': 37,
'b2g_version': (2, 2, 0),
},
'try': {
'lock_platforms': True,
'platforms': {
- 'linux32_gecko': {},
- 'linux32_gecko-debug': {},
- 'linux64_gecko': {},
- 'linux64_gecko-debug': {},
'linux64-b2g-haz': {},
'macosx64_gecko': {},
'macosx64_gecko-debug': {},
'macosx64-mulet': {},
'win32_gecko': {},
'win32_gecko-debug': {},
'win32-mulet': {},
'linux64_graphene': {},
@@ -1646,33 +1442,25 @@ BRANCHES['try']['gaia_l10n_root'] = 'htt
BRANCHES['try']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
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']['linux32_gecko']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux32_gecko-debug']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64_gecko']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64_gecko-debug']['slaves'] = TRY_SLAVES['mock']
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']['macosx64-mulet']['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']
BRANCHES['try']['platforms']['win32-mulet']['slaves'] = TRY_SLAVES['win64-rev2']
# Bug 1127482 - Make Windows opt and debug, linux debug, and osx debug B2G Desktop builds periodic
## we can't have 1127482 builders be periodic on try so let's revert them back to dep builds
-BRANCHES['try']['platforms']['linux32_gecko-debug']['enable_dep'] = True
-BRANCHES['try']['platforms']['linux32_gecko-debug']['enable_periodic'] = False
-BRANCHES['try']['platforms']['linux64_gecko-debug']['enable_dep'] = True
-BRANCHES['try']['platforms']['linux64_gecko-debug']['enable_periodic'] = False
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
@@ -1746,17 +1534,17 @@ for branch in BRANCHES:
if 'flame' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['flame']
if 'flame_eng' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['flame_eng']
# b2g 1.4+
for name, branch in items_before(BRANCHES, 'gecko_version', 30):
for p in ('linux64_gecko-debug', 'macosx64_gecko-debug',
- 'linux32_gecko-debug', 'win32_gecko-debug',
+ 'win32_gecko-debug',
'emulator-kk', 'emulator-kk-debug'):
if p in branch['platforms']:
del branch['platforms'][p]
# exact rooting was enabled in gecko 32
for name, branch in items_before(BRANCHES, 'gecko_version', 32):
if 'linux64-b2g-haz' in branch['platforms']:
del branch['platforms']['linux64-b2g-haz']
@@ -1776,16 +1564,22 @@ for name, branch in items_before(BRANCHE
# Disable emulators for gecko 39 and higher, they're now in TC
# See bug 1143766
for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
for p in ('emulator-l', 'emulator-kk', 'emulator-jb',
'emulator-l-debug', 'emulator-kk-debug', 'emulator-jb-debug'):
if p in branch['platforms']:
del branch['platforms'][p]
+# Disable linux b2g desktop builds for gecko 39 and higher, they're now in TC
+# See bug 1146604
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
+ for p in ('linux64_gecko', 'linux64_gecko-debug'):
+ if p in branch['platforms']:
+ del branch['platforms'][p]
# Enable mozharness pinning
for name, branch in items_at_least(BRANCHES, 'gecko_version', 38):
if name in ('ash', 'try', 'fx-team', 'mozilla-central', 'b2g-inbound'):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
@@ -1822,21 +1616,16 @@ for branch in ACTIVE_PROJECT_BRANCHES:
# 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'
-# We don't run these tests on b2g-inbound
-for b in ('b2g-inbound',):
- BRANCHES[b]['platforms']['linux32_gecko']['enable_checktests'] = False
- BRANCHES[b]['platforms']['linux64_gecko']['enable_checktests'] = False
-
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:
items = dict([(b, BRANCHES[b]) for b in args])--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -32,22 +32,16 @@ PROJECT_BRANCHES = {
#'ux': {
# 'branch_name': 'UX',
# 'mobile_branch_name': 'UX',
# 'build_branch': 'UX',
# 'enable_nightly': True,
#},
##### TWIGS aka RENTABLE BRANCHES
'alder': {
- 'lock_platforms': True,
- 'platforms': {
- 'linux32_gecko': {},
- 'linux64_gecko': {},
- 'linux64_gecko-debug': {},
- },
},
'ash': {
'enable_nightly': True,
'platforms': {
'nexus-4': {
'enable_nightly': True,
},
'nexus-4_eng': {
@@ -121,58 +115,16 @@ PROJECT_BRANCHES = {
"linux64_graphene": {},
"macosx64_graphene": {},
"win64_graphene": {},
}
},
'maple': {
'enable_nightly': True,
'platforms': {
- 'linux32_gecko': {
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': ['--config', 'b2g/desktop_linux32.py'],
- 'reboot_command': ['echo', 'true'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- },
- 'linux32_gecko-debug': {
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': [
- '--config', 'b2g/desktop_linux32.py',
- '--custom-build-variant-cfg', 'b2g-debug',
- ],
- 'reboot_command': ['echo', 'true'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- },
- 'linux64_gecko': {
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': ['--config', 'b2g/desktop_linux64.py'],
- 'reboot_command': ['echo', 'true'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- },
- 'linux64_gecko-debug': {
- 'mozharness_desktop_build': {
- 'script_name': 'scripts/b2g_desktop_build.py',
- 'extra_args': [
- '--config', 'b2g/desktop_linux64.py',
- '--custom-build-variant-cfg', 'b2g-debug',
- ],
- 'reboot_command': ['echo', 'true'],
- 'mozharness_repo_cache': '/tools/checkouts/mozharness',
- 'tools_repo_cache': '/tools/checkouts/build-tools',
- },
- },
'macosx64_gecko': {
'mozharness_desktop_build': {
'script_name': 'scripts/b2g_desktop_build.py',
'extra_args': ['--config', 'b2g/desktop_macosx64.py'],
},
},
'macosx64_gecko-debug': {
'mozharness_desktop_build': {--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -31,17 +31,16 @@ BRANCH_PRIORITIES = {
'mozilla-central': 3,
'comm-central': 3,
'mozilla-aurora': 3,
'comm-aurora': 3,
# Unlisted branches are prioritized at this level
'mozilla-inbound': 4,
'b2g-inbound': 4,
'fx-team': 4,
- 'gaia-try': 4,
'try': 5,
'try-comm-central': 5,
'alder': 5,
'ash': 5,
'birch': 5,
'cedar': 5,
'cypress': 5,
'date': 5,