Bug 1128643 - Enable mozharness pinning for b2g30_v1_4. r=rail
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -2312,16 +2312,20 @@ BRANCHES['try']['enable_try'] = True
BRANCHES['gaia-try']['repo_path'] = "integration/gaia-try"
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 38):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
+BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
+ "testing/mozharness/mozharness.json"
+
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:
slave_p['opt_unittest_suites'] = [x for x in slave_p['opt_unittest_suites']
if x[0] if x[0] not in suites_to_be_excluded]
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1907,16 +1907,20 @@ BRANCHES['mozilla-inbound']['platforms']
BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['debug_unittest_skiptimeout'] = 1800
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 38):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
+BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
+ "testing/mozharness/mozharness.json"
+
# Filter the tests that are enabled on holly for bug 985718.
for platform in BRANCHES['holly']['platforms'].keys():
if platform not in PLATFORMS:
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
slave_p = BRANCHES['holly']['platforms'][platform][slave_platform]
slave_p['opt_unittest_suites'] = MOCHITEST + REFTEST_ONE_CHUNK + REFTEST_NO_IPC + MOCHITEST_DT
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1716,16 +1716,20 @@ BRANCHES['try']['enable_try'] = True
BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] += ANDROID_X86_NOT_GREEN_DICT[:]
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 38):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
+BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
+ "testing/mozharness/mozharness.json"
+
#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/config.py
+++ b/mozilla/config.py
@@ -2764,16 +2764,20 @@ for platform in BRANCHES['try']['platfor
BRANCHES['try']['platforms'][platform]['upload_symbols'] = False
# Enable mozharness pinning
for _, branch in items_at_least(BRANCHES, 'gecko_version', 38):
branch['script_repo_manifest'] = \
"https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
"testing/mozharness/mozharness.json"
+BRANCHES['mozilla-b2g30_v1_4']['script_repo_manifest'] = \
+ "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
+ "testing/mozharness/mozharness.json"
+
######## generic branch configs
for branch in ACTIVE_PROJECT_BRANCHES:
branchConfig = PROJECT_BRANCHES[branch]
BRANCHES[branch]['product_name'] = branchConfig.get('product_name', None)
BRANCHES[branch]['app_name'] = branchConfig.get('app_name', None)
BRANCHES[branch]['brand_name'] = branchConfig.get('brand_name', None)
BRANCHES[branch]['repo_path'] = branchConfig.get('repo_path', 'projects/' + branch)
BRANCHES[branch]['enabled_products'] = branchConfig.get('enabled_products',