--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -15,17 +15,19 @@ SlavePasswords = {
"ubuntu64_vm-b2g-lg-emulator": "pass",
"ubuntu64_vm-b2g-emulator-jb": "pass",
"ubuntu64_vm-b2g-emulator-kk": "pass",
"ubuntu64_vm-b2g-emulator-l": "pass",
"ubuntu64_vm-b2gdt": "pass",
"ubuntu64_hw": "pass",
"ubuntu64_hw-b2g": "pass",
"tiger": "pass",
- "snowleopard": "pass",
+ "snowleopard": "pass",
+ "mountainlion": "pass",
+ "mountainlion-b2gdt": "pass",
"yosemite": "pass",
"xp": "pass",
"xp-ix": "pass",
"win7": "pass",
"win7-ix": "pass",
"win8": "pass",
"win8_64": "pass",
"win10": "pass",--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -53,16 +53,17 @@ BRANCHES = {
#'services-central': {}, # Bug 1010674
'try': {},
}
setMainFirefoxVersions(BRANCHES)
PLATFORMS = {
'linux64_gecko': {},
+ 'macosx64_gecko': {},
'emulator': {},
'emulator-jb': {},
'emulator-kk': {},
}
builder_prefix = "b2g"
PLATFORMS['linux64_gecko']['slave_platforms'] = ['ubuntu64_vm-b2gdt', ]
@@ -71,16 +72,27 @@ PLATFORMS['linux64_gecko']['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',
'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
}
+PLATFORMS['macosx64_gecko']['slave_platforms'] = ['mountainlion-b2gdt', ]
+PLATFORMS['macosx64_gecko']['env_name'] = 'linux-perf'
+PLATFORMS['macosx64_gecko']['mountainlion-b2gdt'] = {'name': builder_prefix + "_macosx64"}
+PLATFORMS['macosx64_gecko']['stage_product'] = 'b2g'
+PLATFORMS['macosx64_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['emulator']['slave_platforms'] = ['ubuntu64_vm-b2g-emulator', 'ubuntu64_vm-b2g-lg-emulator']
PLATFORMS['emulator']['env_name'] = 'linux-perf'
PLATFORMS['emulator']['ubuntu64_vm-b2g-emulator'] = {'name': "b2g_emulator_vm"}
PLATFORMS['emulator']['ubuntu64_vm-b2g-lg-emulator'] = {'name': "b2g_emulator_vm_large"}
PLATFORMS['emulator']['stage_product'] = 'b2g'
PLATFORMS['emulator']['mozharness_config'] = {
'mozharness_python': '/tools/buildbot/bin/python',
'use_mozharness': True,
@@ -118,17 +130,18 @@ 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': {
- 'linux64_gecko': {},
+ 'linux64_gecko': {},
+ 'macosx64_gecko': {},
'emulator': {},
'emulator-jb': {},
'emulator-kk': {},
},
}
SUITES = {}
@@ -933,17 +946,38 @@ PLATFORM_UNITTEST_VARS = {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'reftest',
'--this-chunk', 10, '--total-chunks', 10,
],
},
},
},
- },
+ },
+ 'macosx64_gecko': {
+ 'product_name': 'b2g',
+ 'app_name': 'b2g',
+ 'brand_name': 'Gecko',
+ 'builds_before_reboot': 1,
+ 'unittest-env': {
+ "MOZ_NO_REMOTE": '1',
+ "NO_EM_RESTART": '1',
+ "XPCOM_DEBUG_BREAK": 'warn',
+ "MOZ_CRASHREPORTER_NO_REPORT": '1',
+ # for extracting dmg's
+ "PAGER": '/bin/cat',
+ },
+ 'enable_opt_unittests': False,
+ 'enable_debug_unittests': False,
+ 'mountainlion-b2gdt': {
+ 'opt_unittest_suites': [],
+ 'debug_unittest_suites': [],
+ 'suite_config': {},
+ },
+ },
'emulator': {
'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,--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -81,19 +81,21 @@ PLATFORMS = {
'linux': {},
'linux64': {},
'linux64-asan': {},
'linux64-tsan': {},
'linux64-cc': {},
'win64': {},
}
-PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'yosemite']
+PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'mountainlion', 'yosemite']
PLATFORMS['macosx64']['env_name'] = 'mac-perf'
PLATFORMS['macosx64']['snowleopard'] = {'name': "Rev4 MacOSX Snow Leopard 10.6"}
+PLATFORMS['macosx64']['mountainlion'] = {'name': "Rev5 MacOSX Mountain Lion 10.8",
+ 'try_by_default': False}
PLATFORMS['macosx64']['yosemite'] = {'name': "Rev5 MacOSX Yosemite 10.10",
'try_by_default': False}
PLATFORMS['macosx64']['stage_product'] = 'firefox'
PLATFORMS['macosx64']['mozharness_config'] = {
'mozharness_python': '/tools/buildbot/bin/python',
'hg_bin': 'hg',
'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
'system_bits': '64',
@@ -1783,17 +1785,98 @@ PLATFORM_UNITTEST_VARS = {
},
'web-platform-tests-reftests': {
'config_files': ["web_platform_tests/prod_config.py"],
},
'mozbase': {
'config_files': ["unittests/mac_unittest.py"],
},
},
- },
+ },
+ 'mountainlion': {
+ 'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
+ 'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:] + XPCSHELL,
+ 'suite_config': {
+ 'mochitest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-push': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-browser-chrome': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-e10s-browser-chrome': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-other': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-devtools-chrome': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-e10s-devtools-chrome': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-gl': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'mochitest-jetpack': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'webapprt-chrome': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'reftest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'reftest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'jsreftest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'crashtest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'crashtest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'reftest-no-accel': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'xpcshell': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'cppunit': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'cpp_gtest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'marionette': {
+ 'config_files': ["marionette/prod_config.py"],
+ },
+ 'jittest': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ 'web-platform-tests': {
+ 'config_files': ["web_platform_tests/prod_config.py"],
+ },
+ 'web-platform-tests-reftests': {
+ 'config_files': ["web_platform_tests/prod_config.py"],
+ },
+ 'mozbase': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
+ },
+ },
'yosemite': {
'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:] + XPCSHELL,
'suite_config': {
'mochitest': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-push': {
@@ -2168,16 +2251,31 @@ for name, branch in items_at_least(BRANC
# Run talos g2 for all talos platforms starting from 40
for name, branch in items_at_least(BRANCHES, 'gecko_version', 40):
if name.startswith('mozilla-b2g'):
continue
branch['g2_tests'] = (1, False, TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS)
+# disable cppunittests on mountainlion, leave enabled on yosemite (bug 1190060)
+for platform in PLATFORMS.keys():
+ for slave_platform in PLATFORMS[platform]['slave_platforms']:
+ if slave_platform not in ('mountainlion',):
+ continue
+ for branch in BRANCHES.keys():
+ if platform in BRANCHES[branch]['platforms']:
+ for suite_type in ['opt_unittest_suites', 'debug_unittest_suites']:
+ for cpp_suite in CPPUNIT:
+ try:
+ BRANCHES[branch]['platforms'][platform][slave_platform][suite_type].remove(cpp_suite)
+ except ValueError:
+ # wasn't in the list anyways
+ pass
+
# Enable Mn on opt/debug win for gecko >= 33
for platform in PLATFORMS.keys():
if platform != 'win32':
continue
for name, branch in items_at_least(BRANCHES, 'gecko_version', 33):
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if platform in BRANCHES[name]['platforms']:
if slave_platform in BRANCHES[name]['platforms'][platform]:
@@ -2322,17 +2420,17 @@ for p in PLATFORMS.keys():
jittests = JITTEST_CHUNKED
else:
jittests = JITTEST
for _, branch in items_at_least(BRANCHES, 'gecko_version', 31):
for sp in PLATFORMS[p]['slave_platforms']:
# See Bug 997946 - skip these on OS X 10.8 due to limited capacity
- if sp in ['yosemite', ]:
+ if sp in ['mountainlion', 'yosemite']:
continue
if p in branch['platforms'] and sp in branch['platforms'][p]:
branch['platforms'][p][sp]['opt_unittest_suites'] += jittests[:]
if branch['platforms'][p][sp]['debug_unittest_suites'] != []:
branch['platforms'][p][sp]['debug_unittest_suites'] += jittests[:]
# Enable webapprt-chrome tests on cedar
@@ -2425,22 +2523,26 @@ for name, branch in items_at_least(BRANC
# keep debug tests on 10.8 until the source of the slowness is found in bug 1125998
include_yosemite = ['try']
for platform in PLATFORMS.keys():
# See Bug 997946 - skip these on OS X 10.8 due to limited capacity
for name, branch in items_at_least(BRANCHES, 'gecko_version', 38):
if platform not in branch['platforms']:
continue
for slave_platform in branch['platforms'][platform]:
- if slave_platform not in ['yosemite']:
+ if slave_platform not in ['mountainlion', 'yosemite']:
continue
if name not in include_yosemite:
include_yosemite.append(name)
delete_slave_platform(BRANCHES, PLATFORMS, {'macosx64': 'yosemite'}, branch_exclusions=include_yosemite)
-for branch in include_yosemite:
+for branch in include_yosemite:
+ if branch in ['try']:
+ continue
+ BRANCHES[branch]['platforms']['macosx64']['mountainlion']['opt_unittest_suites'] = []
+ BRANCHES[branch]['platforms']['macosx64']['mountainlion']['debug_unittest_suites'] = []
#disable talos on branches that have 10.10 enabled excluding b2g-inbound
#which didn't have talos tests before.
# We don't track talos on mozilla-release, lets ensure we don't run jobs we don't need.
if branch in ['b2g-inbound', 'mozilla-release', 'mozilla-esr38']:
continue
BRANCHES[branch]['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard','yosemite']
# Enable win10 on try only--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -1,14 +1,15 @@
SLAVES = {
'xp-ix': {},
'win7-ix': {},
'win8': {},
'win10': {},
'snowleopard': {},
+ 'mountainlion': {},
'yosemite': {},
'panda_android': {},
'ubuntu32_vm': {},
'ubuntu64_vm': {},
'ubuntu64_vm_large': {},
'ubuntu32_hw': {},
'ubuntu64_hw': {},
'win64_vm': {},
@@ -25,18 +26,21 @@ for i in range(1, 102) + range(103, 181)
for i in range(1, 11):
SLAVES['win10']['t-w1064-ix-%04i' % i] = {}
for i in range(102, 103): # Use win8's 102 for win10 // Bug 1191481
SLAVES['win10']['t-w864-ix-%03i' % i] = {}
for i in range(1, 166):
SLAVES['snowleopard']['t-snow-r4-%04i' % i] = {}
+
+for i in range(1, 14):
+ SLAVES['mountainlion']['talos-mtnlion-r5-%03i' % i] = {}
-for i in range(1, 29) + range(29, 94):
+for i in range(1, 29) + range(29, 94) + range(96, 108):
SLAVES['yosemite']['t-yosemite-r5-%04i' % i] = {}
for i in range(22, 910):
SLAVES['panda_android']['panda-%04i' % i] = {
'http_port': '30%03i' % i,
'ssl_port': '31%03i' % i,
}
@@ -72,16 +76,17 @@ SLAVES['ubuntu64-asan_vm'] = SLAVES['ubu
SLAVES['ubuntu32_vm-b2gdt'] = SLAVES['ubuntu32_vm']
SLAVES['ubuntu64_vm-b2g'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm-b2gdt'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm-b2g-emulator'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm-b2g-lg-emulator'] = SLAVES['ubuntu64_vm_large']
SLAVES['ubuntu64_vm-b2g-emulator-jb'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm-b2g-emulator-kk'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_hw-b2g'] = SLAVES['ubuntu64_hw']
+SLAVES['mountainlion-b2gdt'] = SLAVES['mountainlion']
SLAVES['win8_64'] = SLAVES['win8']
SLAVES['win10_64'] = SLAVES['win10']
SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm_armv7_mobile'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm_armv7_large'] = SLAVES['ubuntu64_vm_large']
TRY_SLAVES = {}
