Bug 1272005 - Disable cedar branch, r=kmoir
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3317,55 +3317,16 @@ for branch_name in ('try',):
if slave_platform == 'ubuntu64_vm':
continue
branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
MOCHITEST_GPU + MOCHITEST_CLIPBOARD
branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
MOCHITEST_GPU_E10S + MOCHITEST_CLIPBOARD_E10S
-### 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
- BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOZBASE
-
-# Enable web-platform-tests on cedar
-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 platform in ('linux64-asan',):
- 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
- BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_REFTESTS_E10S
- BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_E10S
- BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_MORE_E10S + WEB_PLATFORM_REFTESTS_E10S
-
-
### Test suites that only run on Try ###
# Enable linux64-cc, linux64-tsan, and win10 on Try only
delete_slave_platform(BRANCHES, PLATFORMS, {'win64': 'win10_64'}, branch_exclusions=["try"])
ride_trains_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -2879,20 +2879,16 @@ BRANCHES['mozilla-aurora']['pgo_platform
######## try
BRANCHES['try']['repo_path'] = "try"
BRANCHES['try']['platforms']['android-api-15']['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[:]
-
#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'):
ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -744,22 +744,16 @@ 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'):
- if platform in BRANCHES['cedar']['platforms']:
- del BRANCHES['cedar']['platforms'][platform]
-
# bug 1222209 - Remove nexus-4 builds from pine
for platform in ('nexus-4', 'nexus-4_eng'):
if platform in BRANCHES['pine']['platforms']:
del BRANCHES['pine']['platforms'][platform]
######## mozilla-central
# This is a path, relative to HGURL, where the repository is located
# HGURL + repo_path should be a valid repository
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -64,19 +64,18 @@ PROJECT_BRANCHES = {
},
'emulator-kk-debug': {
'enable_nightly': True,
},
},
},
# Not needed on Birch at the moment, bug 977420.
#'birch': {},
- 'cedar': {
- 'mozharness_tag': 'default',
- },
+ #Not needed on Cedar at the moment, bug 1272005
+ #'cedar': {},
'cypress': {
'lock_platforms': True,
'platforms': {
# Limit B2G to none for Bug 787208
},
},
# B2G builds not required on date
# 'date': {},
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -57,30 +57,17 @@ PROJECT_BRANCHES = {
},
'win32': {},
'win32-debug': {},
'win64': {},
'win64-debug': {},
},
},
#'birch': {}, # Bug 1010674
- 'cedar': {
- 'enable_perproduct_builds': False,
- 'mozharness_tag': 'default',
- 'enable_talos': True,
- 'talos_suites': {
- 'xperf': 1,
- },
- 'enable_opt_unittests': True,
- 'mobile_platforms': {
- 'android-x86': {
- 'enable_opt_unittests': True,
- },
- },
- },
+ #'cedar': {}, # Bug 1272005
'cypress': {
'lock_platforms': True,
'platforms': {
# Limit Firefox to none for Bug 787208
},
},
'date': {
'desktop_mozharness_builds_enabled': True,