Bug 1110286 - Enable mozharness pinning for mozilla-central. r=rail
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -2307,17 +2307,17 @@ BRANCHES['mozilla-central']['branch_name
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['gaia-try']['repo_path'] = "integration/gaia-try"
# Enable mozharness pinning
-for branch in ('ash', 'fx-team', 'try',):
+for branch in ('ash', 'fx-team', 'mozilla-central', 'try',):
BRANCHES[branch]['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]):
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1902,17 +1902,17 @@ BRANCHES['mozilla-inbound']['platforms']
BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['debug_unittest_skipcount'] = 3
BRANCHES['mozilla-inbound']['platforms']['macosx64']['mountainlion']['debug_unittest_skiptimeout'] = 1800
BRANCHES['mozilla-inbound']['platforms']['macosx64']['yosemite']['debug_unittest_skipcount'] = 2
BRANCHES['mozilla-inbound']['platforms']['macosx64']['yosemite']['debug_unittest_skiptimeout'] = 1800
BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['debug_unittest_skipcount'] = 2
BRANCHES['mozilla-inbound']['platforms']['linux']['ubuntu32_vm']['debug_unittest_skiptimeout'] = 1800
# Enable mozharness pinning
-for branch in ('ash', 'fx-team', 'try',):
+for branch in ('ash', 'fx-team', 'mozilla-central', 'try',):
BRANCHES[branch]['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
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1711,17 +1711,17 @@ BRANCHES['try']['platforms']['android-ap
BRANCHES['try']['pgo_strategy'] = 'try'
BRANCHES['try']['pgo_platforms'] = []
BRANCHES['try']['enable_try'] = True
# Until we green out these Android x86 tests
BRANCHES['cedar']['platforms']['android-x86']['ubuntu64_hw']['opt_unittest_suites'] += ANDROID_X86_NOT_GREEN_DICT[:]
# Enable mozharness pinning
-for branch in ('ash', 'fx-team', 'try',):
+for branch in ('ash', 'fx-team', 'mozilla-central', 'try',):
BRANCHES[branch]['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)
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2759,17 +2759,17 @@ BRANCHES['try']['platforms']['android-x8
for platform in BRANCHES['try']['platforms'].keys():
# Sadly, the rule that mobile builds go to /mobile/
# isn't true for try :(
BRANCHES['try']['platforms'][platform]['stage_product'] = 'firefox'
# Disable symbol upload across the board
BRANCHES['try']['platforms'][platform]['upload_symbols'] = False
# Enable mozharness pinning
-for branch in ('ash', 'fx-team', 'try',):
+for branch in ('ash', 'fx-team', 'mozilla-central', 'try',):
BRANCHES[branch]['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)