Bug 1126433 - Return Ash to its original settings. r=bhearsum
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1785,21 +1785,16 @@ for name, branch in items_at_least(BRANC
continue
if not branch['platforms'][platform][slave_plat]['debug_unittest_suites']:
continue
if branch['platforms'][platform]['enable_debug_unittests'] is True:
for type in branch['platforms'][platform][slave_plat]:
if 'debug_unittest_suite' in type:
BRANCHES[name]['platforms'][platform][slave_plat]['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_PLAIN_REFTEST)
-# have to disable this manually or it blows up in misc.py
-for platform_name in ('android', 'android-api-9', 'android-api-11'):
- if platform_name in BRANCHES['ash']['platforms']:
- BRANCHES['ash']['platforms'][platform_name]['enable_debug_unittests'] = False
-
def remove_suite_from_slave_platform(BRANCHES, PLATFORMS, suite_to_remove, slave_platform, branches_to_keep=[]):
"""Remove suites named like |suite_to_remove| from all branches on slave platforms named like |slave_platform|.
Updates BRANCHES in place. Consumes PLATFORMS without side
effects. Does not remove any suites from the specified
|branches_to_keep|."""
@@ -1827,17 +1822,17 @@ effects. Does not remove any suites from
# schedule jittests for pandas on cedar and try
# https://bugzilla.mozilla.org/show_bug.cgi?id=912997
# 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=['ash', 'cedar'])
+remove_suite_from_slave_platform(BRANCHES, PLATFORMS, 'instrumentation', 'panda_android', branches_to_keep=['cedar'])
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -40,29 +40,23 @@ PROJECT_BRANCHES = {
'lock_platforms': True,
'platforms': {
'linux32_gecko': {},
'linux64_gecko': {},
'linux64_gecko-debug': {},
'linux64-mulet': {},
},
},
- 'ash': {
- 'mozharness_repo_path': 'build/ash-mozharness',
- 'mozharness_repo': 'https://hg.mozilla.org/build/ash-mozharness',
- 'mozharness_tag': 'default',
- },
+ 'ash': {},
# Not needed on Birch at the moment, bug 977420.
#'birch': {},
'cedar': {
'mozharness_tag': 'default',
},
- 'cypress': {
- 'mozharness_tag': 'default',
- },
+ 'cypress': {},
# B2G builds not required on date
# 'date': {},
'fig': {
'lock_platforms': True,
'platforms': {},
},
'gum': {},
# disabled for bug 985718
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -87,39 +87,18 @@ PROJECT_BRANCHES = {
},
'win64': {
'nightly_signing_servers': 'nightly-signing',
},
},
},
# no desktop builds for bug 1100150
# 'alder': {},
- 'ash': {
- 'merge_builds': False,
- 'enable_perproduct_builds': True,
- 'desktop_mozharness_repacks_enabled': False,
- 'enable_nightly': True,
- 'create_snippet': True,
- 'create_partial': True,
- 'create_mobile_snippet': True,
- 'nightly_signing_servers': 'nightly-signing',
- 'l10n_repo_path': 'releases/l10n/mozilla-aurora',
- 'enable_l10n': True,
- 'enable_l10n_onchange': False,
- 'enUS_binaryURL': '/nightly/latest-ash',
- 'l10nNightlyUpdate': True,
- 'l10nDatedDirs': True,
- 'l10n_tree': 'fxrel',
- 'l10n_platforms': ['linux', 'linux64', 'win32', 'macosx64'],
- 'pgo_strategy': 'periodic',
- 'periodic_start_hours': range(1, 24, 3),
- 'talos_suites': {
- 'xperf': 1,
- },
- 'branch_projects': ['spidermonkey_tier_1', 'spidermonkey_info'],
+ 'ash': {,
+ 'enable_perproduct_builds': False,
},
#'birch': {}, # Bug 1010674
'cedar': {
'enable_perproduct_builds': False,
'mozharness_tag': 'default',
'enable_talos': True,
'talos_suites': {
'xperf': 1,
@@ -128,17 +107,16 @@ PROJECT_BRANCHES = {
'mobile_platforms': {
'android-x86': {
'enable_opt_unittests': True,
},
},
},
'cypress': {
'enable_perproduct_builds': False,
- 'mozharness_tag': 'default',
'enable_talos': True,
},
'date': {
'gecko_version': 36,
'mozharness_repo_path': 'users/nthomas_mozilla.com/mozharness-build-promotion',
'mozharness_repo': 'https://hg.mozilla.org/users/nthomas_mozilla.com/mozharness-build-promotion',
'mozharness_tag': 'default',
'desktop_mozharness_builds_enabled': True,