Bug 1110286 - Pin mozharness in all trees - b2g_builds will come soon after. r=rail
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Mon, 09 Feb 2015 09:47:22 -0500 (2015-02-09)
changeset 11783 92bac9ad80b621c4b3c6c85339ad1fc2b2d4519d
parent 11782 770c40f49e9b62b948a38229ff67549f61c84dc1
child 11784 d52fa7764259dd76970068868d80b732eaff1d49
push id8566
push userarmenzg@mozilla.com
push dateMon, 09 Feb 2015 14:47:47 +0000 (2015-02-09)
reviewersrail
bugs1110286
Bug 1110286 - Pin mozharness in all trees - b2g_builds will come soon after. r=rail
mozilla-tests/b2g_config.py
mozilla-tests/config.py
mozilla-tests/mobile_config.py
mozilla/b2g_config.py
mozilla/config.py
--- 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 items_at_least(BRANCHES, 'gecko_version', 38):
+for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
     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"
 
--- 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 items_at_least(BRANCHES, 'gecko_version', 38):
+for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
     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"
 
--- 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 items_at_least(BRANCHES, 'gecko_version', 38):
+for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
     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"
 
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1963,17 +1963,17 @@ for name, branch in items_before(BRANCHE
 # b2g 2.0+
 for name, branch in items_before(BRANCHES, 'gecko_version', 32):
     for p in ('flame-kk', 'flame-kk_eng', 'flame-kk_eng-debug'):
         if p in branch['platforms']:
             del branch['platforms'][p]
 
 # Enable mozharness pinning
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 38):
-    if name in ('ash', 'try',):
+    if name in ('ash', 'try', 'fx-team', 'mozilla-central', 'b2g-inbound'):
         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]['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2758,17 +2758,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 items_at_least(BRANCHES, 'gecko_version', 38):
+for _, branch in items_at_least(BRANCHES, 'gecko_version', 30):
     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"