Bug 1198400 - Unschedule most jobs from cedar, r=jlund
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -1592,19 +1592,19 @@ for branch in BRANCHES.keys():
BRANCHES['alder']['branch_name'] = "Alder"
BRANCHES['alder']['repo_path'] = "projects/alder"
BRANCHES['ash']['branch_name'] = "Ash"
BRANCHES['ash']['repo_path'] = "projects/ash"
BRANCHES['cedar']['branch_name'] = "Cedar"
BRANCHES['cedar']['repo_path'] = "projects/cedar"
BRANCHES['cedar']['mozharness_tag'] = "default"
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = \
- MOCHITEST + REFTEST_20 + CRASHTEST + XPCSHELL + MARIONETTE + JSREFTEST + CPPUNIT
+ MOCHITEST + MARIONETTE + CPPUNIT
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
- MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED + CPPUNIT
+ MARIONETTE[:] + CPPUNIT
BRANCHES['maple']['branch_name'] = "Maple"
BRANCHES['maple']['repo_path'] = "projects/maple"
BRANCHES['pine']['branch_name'] = "Pine"
BRANCHES['pine']['repo_path'] = "projects/pine"
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = \
MOCHITEST + CRASHTEST + XPCSHELL + MARIONETTE + JSREFTEST + REFTEST_20
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -739,27 +739,16 @@ WEB_PLATFORM_TESTS_CHUNKED_MORE = [
'script_path': 'scripts/web_platform_tests.py',
'extra_args': ["--test-type=testharness"],
'totalChunks': 8,
'blob_upload': True,
'script_maxtime': 7200,
}),
]
-### Webapprt Tests ###
-WEBAPPRT_CHROME = [
- ('webapprt-chrome', {
- 'use_mozharness': True,
- 'script_path': 'scripts/desktop_unittest.py',
- 'extra_args': ['--webapprt-suite', 'chrome'],
- 'blob_upload': True,
- 'script_maxtime': 4800,
- })
-]
-
### XPCShell ###
XPCSHELL = [
('xpcshell', {
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--xpcshell-suite', 'xpcshell'],
'blob_upload': True,
'script_maxtime': 7200,
@@ -2062,19 +2051,16 @@ BRANCHES['try']['other-e10s_l64_tests']
BRANCHES['try']['other-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
BRANCHES['try']['svgr-e10s_tests'] = (1, False, {}, NO_OSX)
BRANCHES['try']['svgr-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
BRANCHES['try']['dromaeojs-e10s_tests'] = (1, False, {}, NO_OSX)
BRANCHES['try']['chromez-e10s_tests'] = (1, False, {}, NO_OSX)
BRANCHES['try']['chromez-osx-e10s_tests'] = (1, False, {}, OSX_ONLY)
-######## cedar
-BRANCHES['cedar']['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MARIONETTE[:]
-
loadSkipConfig(BRANCHES,"desktop")
# Remove mochitest-browser-chrome and mochitest-devtools-chrome
# from versioned b2g branches - bug 1045398
for name in [x for x in BRANCHES.keys() if x.startswith('mozilla-b2g')]:
branch = BRANCHES[name]
for platform in branch['platforms']:
for item in branch['platforms'][platform].keys():
@@ -2240,16 +2226,26 @@ for platform in BRANCHES['holly']['platf
# Enable content sandbox tests for Windows bit
if slave_platform in PLATFORMS['win64']['slave_platforms'] or slave_platform in PLATFORMS['win32']['slave_platforms']:
slave_p['opt_unittest_suites'] += MOCHITEST_CSB
slave_p['debug_unittest_suites'] += MOCHITEST_CSB
### Test suites that only run on Cedar ###
+# Turn off most suites on cedar (bug 1198400)
+for platform in PLATFORMS.keys():
+ if platform not in BRANCHES['cedar']['platforms']:
+ continue
+ for slave_platform in PLATFORMS[platform]['slave_platforms']:
+ if slave_platform in BRANCHES['cedar']['platforms'][platform]:
+ BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] = []
+ BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] = []
+
+BRANCHES['cedar']['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MARIONETTE[:]
# Enable mozbase unit tests (bug 971687)
for platform in PLATFORMS.keys():
if platform not in BRANCHES['cedar']['platforms']:
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform in BRANCHES['cedar']['platforms'][platform]:
BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOZBASE[:]
@@ -2259,30 +2255,21 @@ for platform in PLATFORMS.keys():
for platform in PLATFORMS.keys():
if platform not in BRANCHES['cedar']['platforms']:
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform not in BRANCHES['cedar']['platforms'][platform]:
continue
- if not (platform in ('linux64', 'linux', 'win32', 'win64') or
- (platform == "macosx64" and slave_platform != "snowleopard")):
+ if platform in ('linux64', 'linux', 'win32', 'win64', 'macosx64'):
BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_REFTESTS[:]
BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED[:]
BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_MORE[:] + WEB_PLATFORM_REFTESTS
-# Enable webapprt-chrome tests
-for platform in PLATFORMS.keys():
- for slave_platform in PLATFORMS[platform]['slave_platforms']:
- if slave_platform not in BRANCHES['cedar']['platforms'][platform]:
- continue
- BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEBAPPRT_CHROME[:]
- BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEBAPPRT_CHROME[:]
-
### Test suites that only run on Try ###
# Enable gtests on try
for platform in PLATFORMS.keys():
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform not in BRANCHES['try']['platforms'][platform]:
continue
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -707,39 +707,16 @@ ANDROID_MOZHARNESS_PLAIN_ROBOCOP = [
'extra_args': ['--cfg', 'android/android_panda_releng.py', '--robocop-suite', 'robocop-10'],
'blob_upload': True,
'timeout': 2400,
'script_maxtime': 14400,
},
),
]
-ANDROID_MOZHARNESS_INSTRUMENTATION = [
- ('instrumentation-browser',
- {'suite': 'instrumentation',
- 'use_mozharness': True,
- 'script_path': 'scripts/android_panda.py',
- 'extra_args': ['--cfg', 'android/android_panda_releng.py', '--instrumentation-suite', 'browser'],
- 'blob_upload': True,
- 'timeout': 2400,
- 'script_maxtime': 14400,
- },
- ),
- ('instrumentation-background',
- {'suite': 'instrumentation',
- 'use_mozharness': True,
- 'script_path': 'scripts/android_panda.py',
- 'extra_args': ['--cfg', 'android/android_panda_releng.py', '--instrumentation-suite', 'background'],
- 'blob_upload': True,
- 'timeout': 2400,
- 'script_maxtime': 14400,
- },
- ),
-]
-
ANDROID_PLAIN_UNITTEST_DICT = {
'opt_unittest_suites': [],
'debug_unittest_suites': [],
}
ANDROID_2_3_C3_DICT = {
'opt_unittest_suites': [],
'debug_unittest_suites': [],
@@ -842,18 +819,17 @@ ANDROID_MOZHARNESS_PANDA_UNITTEST_DICT =
ANDROID_MOZHARNESS_MOCHITEST +
ANDROID_MOZHARNESS_PLAIN_ROBOCOP +
ANDROID_MOZHARNESS_JSREFTEST +
ANDROID_MOZHARNESS_CRASHTEST +
ANDROID_MOZHARNESS_MOCHITESTGL +
ANDROID_MOZHARNESS_PLAIN_REFTEST +
ANDROID_MOZHARNESS_XPCSHELL +
ANDROID_MOZHARNESS_JITTEST +
- ANDROID_MOZHARNESS_CPPUNITTEST +
- ANDROID_MOZHARNESS_INSTRUMENTATION,
+ ANDROID_MOZHARNESS_CPPUNITTEST,
'debug_unittest_suites': ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_JSREFTEST,
}
for suite in ANDROID_PLAIN_REFTEST_DICT['opt_unittest_suites']:
ANDROID_PLAIN_UNITTEST_DICT['opt_unittest_suites'].append(suite)
for suite in ANDROID_PLAIN_ROBOCOP_DICT['opt_unittest_suites']:
ANDROID_PLAIN_UNITTEST_DICT['opt_unittest_suites'].append(suite)
@@ -2368,18 +2344,22 @@ BRANCHES['mozilla-aurora']['pgo_platform
BRANCHES['try']['repo_path'] = "try"
BRANCHES['try']['platforms']['android']['enable_debug_unittests'] = True
BRANCHES['try']['platforms']['android-api-9']['enable_debug_unittests'] = True
BRANCHES['try']['platforms']['android-api-11']['enable_debug_unittests'] = True
BRANCHES['try']['pgo_strategy'] = 'try'
BRANCHES['try']['pgo_platforms'] = []
BRANCHES['try']['enable_try'] = True
+######## cedar
# Until we green out these Android x86 tests
-BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] += ANDROID_X86_NOT_GREEN_DICT[:]
+BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] = ANDROID_X86_NOT_GREEN_DICT[:]
+# Remove all panda tests from cedar
+if 'android-api-9' in BRANCHES['cedar']['platforms']:
+ del BRANCHES['cedar']['platforms']['android-api-9']
#split 2.3 tests to ones that can run on ix and AWS
for suite in ANDROID_2_3_MOZHARNESS_DICT:
if suite[0].startswith('plain-reftest'):
ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
elif suite[0].startswith('crashtest'):
ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
elif suite[0].startswith('jsreftest'):
@@ -2445,21 +2425,16 @@ for name, branch in items_at_least(BRANC
'opt_unittest_suites': deepcopy(ANDROID_2_3_C3_DICT['opt_unittest_suites']),
'debug_unittest_suites': []
}
BRANCHES[name]['platforms'][platform]['ubuntu64_vm_mobile'] = {
'opt_unittest_suites': deepcopy(ANDROID_2_3_AWS_DICT['opt_unittest_suites']),
'debug_unittest_suites': []
}
-for platform_name in ('android', 'android-api-11'):
- if platform_name in BRANCHES['cedar']['platforms']:
- BRANCHES['cedar']['platforms'][platform_name]['enable_debug_unittests'] = True
- BRANCHES['cedar']['platforms'][platform_name]['panda_android']['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_PLAIN_ROBOCOP + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_MOCHITESTGL + ANDROID_MOZHARNESS_PLAIN_REFTEST + ANDROID_MOZHARNESS_XPCSHELL + ANDROID_MOZHARNESS_JITTEST + ANDROID_MOZHARNESS_CPPUNITTEST)
-
#bug 1133833 enable Android 4.3 to run on try
BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_large'] = {
'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
'debug_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['debug_unittest_suites']),
}
BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_mobile'] = {
'opt_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['opt_unittest_suites']),
'debug_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['debug_unittest_suites']),
@@ -2576,24 +2551,19 @@ effects. Does not remove any suites from
if not slave_plat in BRANCHES[branch]['platforms'][platform]:
continue
if not slave_plat == slave_platform:
continue
for unittest_suite_type, unittest_suites in BRANCHES[branch]['platforms'][platform][slave_plat].items():
# This replaces the contents of the unittest_suites list in place with the filtered list.
unittest_suites[:] = [ suite for suite in unittest_suites if not suite_to_remove in suite[0] ]
-# schedule jittests for pandas on cedar and try
-# https://bugzilla.mozilla.org/show_bug.cgi?id=912997
+# schedule jittests for pandas on try
# https://bugzilla.mozilla.org/show_bug.cgi?id=931874
-remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'jittest', 'panda_android', branches_to_keep=['cedar', 'try'])
-
-# schedule instrumentation tests for pandas on ash and cedar
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1064010
-remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'instrumentation', 'panda_android', branches_to_keep=['cedar'])
+remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'jittest', 'panda_android', branches_to_keep=['try'])
# Bug 1182691 - Run Android 2.3 and Android 4.3 mochitest-chrome on trunk
trunk_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 42):
trunk_branches.append(name)
remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'mochitest-chrome', 'ubuntu64_vm_armv7_mobile', branches_to_keep=trunk_branches)
remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'mochitest-chrome', 'ubuntu64_vm_armv7_large', branches_to_keep=trunk_branches)
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1341,16 +1341,25 @@ for branch in BRANCHES.keys():
if branch in ACTIVE_PROJECT_BRANCHES:
for key, value in PROJECT_BRANCHES[branch].items():
if key == 'platforms':
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', 'macosx64-mulet',
+ 'win32-mulet', 'win32-mulet-opt'):
+ 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'
BRANCHES['mozilla-central']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
BRANCHES['mozilla-central']['start_hour'] = [3, 15]
BRANCHES['mozilla-central']['start_minute'] = [2]