Bug 791924 - Enable mozharness try for mobile and b2g jobs on Try and Ash + point cypress to production mozharness. r=rail
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -2183,18 +2183,18 @@ for branch in BRANCHES.keys():
BRANCHES[branch]['pgo_platforms'] = []
# The following are exceptions to the defaults
BRANCHES['alder']['branch_name'] = "Alder"
BRANCHES['alder']['repo_path'] = "projects/alder"
BRANCHES['ash']['branch_name'] = "Ash"
BRANCHES['ash']['repo_path'] = "projects/ash"
-BRANCHES['ash']['mozharness_repo'] = "https://hg.mozilla.org/build/ash-mozharness"
-BRANCHES['ash']['mozharness_tag'] = "default"
+BRANCHES['ash']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"
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 + MARIONETTE_UNIT + JSREFTEST + CPPUNIT
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + MARIONETTE_UNIT + XPCSHELL_CHUNKED + CPPUNIT
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-lg-emulator']['opt_unittest_suites'] = MOCHITEST_MEDIA
@@ -2207,29 +2207,30 @@ BRANCHES['cedar']['platforms']['linux64-
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
BRANCHES['cypress']['branch_name'] = "Cypress"
BRANCHES['cypress']['repo_path'] = "projects/cypress"
-BRANCHES['cypress']['mozharness_tag'] = "default"
BRANCHES['jamun']['repo_path'] = "projects/jamun"
BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
BRANCHES['mozilla-b2g28_v1_3t']['repo_path'] = "releases/mozilla-b2g28_v1_3t"
BRANCHES['mozilla-b2g30_v1_4']['repo_path'] = "releases/mozilla-b2g30_v1_4"
BRANCHES['mozilla-b2g32_v2_0']['repo_path'] = "releases/mozilla-b2g32_v2_0"
BRANCHES['mozilla-b2g34_v2_1']['repo_path'] = "releases/mozilla-b2g34_v2_1"
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['try']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"
BRANCHES['gaia-try']['repo_path'] = "integration/gaia-try"
def exclude_suites(slave_platform, branch, suites_to_be_excluded, from_opt_unittests, from_debug_unittests):
#slave_platform is a tuple, e.g.:
#('linux64_gecko', 'ubuntu64_vm-b2gdt')
if nested_haskey(BRANCHES[branch]['platforms'], slave_platform[0], slave_platform[1]):
slave_p = BRANCHES[branch]['platforms'][slave_platform[0]][slave_platform[1]]
if from_opt_unittests:
@@ -2238,17 +2239,16 @@ def exclude_suites(slave_platform, branc
if from_debug_unittests:
slave_p['debug_unittest_suites'] = [x for x in slave_p['debug_unittest_suites']
if x[0] if x[0] not in suites_to_be_excluded]
exclude_suites(('linux64_gecko', 'ubuntu64_vm-b2gdt'), 'cedar', ('gaia-ui-test',), True, True)
exclude_suites(('macosx64_gecko', 'mountainlion-b2gdt'), 'cedar', ('gaia-ui-test',), True, True)
# Enable mulet reftests on Ash, Cedar and Try
-BRANCHES['ash']['platforms']['linux64-mulet']['ubuntu64_vm-mulet']['opt_unittest_suites'] += REFTEST_MULET
BRANCHES['try']['platforms']['linux64-mulet']['ubuntu64_vm-mulet']['opt_unittest_suites'] += REFTEST_MULET
BRANCHES['cedar']['platforms']['linux64-mulet']['ubuntu64_vm-mulet']['opt_unittest_suites'] += REFTEST_MULET
# new linux64_gecko tests as of gecko 32; OOP replaces their non-OOP variants
for name, branch in items_at_least(BRANCHES, 'gecko_version', 32):
BRANCHES[name]['platforms']['linux64_gecko']['ubuntu64_vm-b2gdt']['opt_unittest_suites'] += \
GAIA_BUILD + REFTEST_DESKTOP_OOP_SANITY + MOCHITEST_OOP_DESKTOP
for suite_to_remove in ('mochitest-1', 'reftest-sanity'):
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1709,20 +1709,25 @@ BRANCHES['mozilla-b2g30_v1_4']['pgo_plat
######## try
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-10']['enable_debug_unittests'] = True
BRANCHES['try']['pgo_strategy'] = 'try'
BRANCHES['try']['pgo_platforms'] = []
BRANCHES['try']['enable_try'] = True
+BRANCHES['try']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"
+
+######## ash
+BRANCHES['ash']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/testing/mozharness/mozharness.json"
# Until we green out these Android x86 tests
BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] += ANDROID_X86_NOT_GREEN_DICT[:]
-BRANCHES['ash']['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'):
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -94,19 +94,16 @@ PROJECT_BRANCHES = {
# 'alder': {},
'ash': {
'enable_perproduct_builds': False,
'desktop_mozharness_repacks_enabled': True,
'enable_nightly': True,
'create_snippet': True,
'create_partial': True,
'create_mobile_snippet': True,
- 'mozharness_repo_path': 'build/ash-mozharness',
- 'mozharness_repo': 'https://hg.mozilla.org/build/ash-mozharness',
- 'mozharness_tag': 'default',
'use_mozharness_repo_cache': False,
'lock_platforms': True,
'talos_suites': {
'xperf': 1,
},
'platforms': {
'linux': {},
'linux64': {},