Bug 929447 - Please schedule Android 4 reftests on all trunk trees and make them ride the trains; r=callek
authorDan Minor <dminor@mozilla.com>
Wed, 08 Jan 2014 09:02:33 -0800
changeset 9689 2d4437269255186410b78c3828f83ad98bacc126
parent 9688 23a9958092967ccba7d4376379503c7c54d6b111
child 9690 c01da43376fbe3532f8635c7497e088b912cd6f8
child 9691 ec33ddeca4f46e008a1e7bba1ce03f291bf270e0
push id7199
push userdminor@mozilla.com
push dateWed, 15 Jan 2014 12:20:06 +0000
reviewerscallek
bugs929447
Bug 929447 - Please schedule Android 4 reftests on all trunk trees and make them ride the trains; r=callek
mozilla-tests/mobile_config.py
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -1130,37 +1130,30 @@ for name, branch in items_before(BRANCHE
                 continue
             if not 'panda' in slave_plat:
                 continue
             for type in branch['platforms'][platform][slave_plat]:
                 for suite in branch['platforms'][platform][slave_plat][type][:]:
                     if "xpcshell" in suite[0]:
                         branch['platforms'][platform][slave_plat][type].remove(suite)
 
-# Support reftests for pandaboards on Cedar and Try
-for branch in BRANCHES:
-    # Loop removes it from any branch that gets beyond here
-    if branch in ('cedar', 'try'):
-        continue
-    for platform in BRANCHES[branch]['platforms']:
-        if not platform in PLATFORMS:
-            continue
-        if not platform.startswith('android'):
+# panda reftests jobs ride the train with 29, so they need to be disabled
+# for branches running an older version.
+# https://bugzilla.mozilla.org/show_bug.cgi?id=929447
+for name, branch in items_before(BRANCHES, 'gecko_version', 29):
+    for platform in branch['platforms']:
+        if platform not in PLATFORMS:
             continue
-        if platform.endswith('-debug'):
-            continue  # no slave_platform for debug
-        for slave_plat in PLATFORMS[platform]['slave_platforms']:
-            if not slave_plat in BRANCHES[branch]['platforms'][platform]:
+        for slave_plat in PLATFORMS[platform].get('slave_platforms', {}):
+            if slave_plat not in branch['platforms'][platform]:
                 continue
-            if not slave_plat == "panda_android":
-                continue
-            for type in BRANCHES[branch]['platforms'][platform][slave_plat]:
-                for suite in BRANCHES[branch]['platforms'][platform][slave_plat][type][:]:
-                    if ("plain-reftest" in suite[0]):
-                        BRANCHES[branch]['platforms'][platform][slave_plat][type].remove(suite)
+            for type_ in branch['platforms'][platform][slave_plat]:
+                for suite in branch['platforms'][platform][slave_plat][type_][:]:
+                    if "plain-reftest" in suite[0]:
+                        branch['platforms'][platform][slave_plat][type_].remove(suite)
 
 # cppunittest jobs ride the train with 28, so they need to be disabled
 # for branches running an older version.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=937637
 for name, branch in items_before(BRANCHES, 'gecko_version', 28):
     for platform in branch['platforms']:
         if platform not in PLATFORMS:
             continue