Bug 967704 - Chunk more the Android 2.3 test jobs. r=armenzg
authorGeoffrey Brown <gbrown@mozilla.com>
Fri, 14 Feb 2014 11:13:44 -0500
changeset 2436 0a41263b6b5a2f294b5462fd61ec62544439c0c7
parent 2433 452f8b450cb092e862111fcf39eaff049a63afe2
child 2437 a385bd1486aa923e085d4968f807f4b61aa94c22
child 2439 c6f6032d798c1c23edd1742b6d56a1d9cfe21feb
push id1762
push userarmenzg@mozilla.com
push dateFri, 14 Feb 2014 16:13:48 +0000
reviewersarmenzg
bugs967704
Bug 967704 - Chunk more the Android 2.3 test jobs. r=armenzg
configs/android/androidarm.py
--- a/configs/android/androidarm.py
+++ b/configs/android/androidarm.py
@@ -80,21 +80,53 @@ config = {
     "test_suite_definitions": {
         "jsreftest": {
             "category": "reftest",
             "extra_args": ["../jsreftest/tests/jstests.list",
                 "--extra-profile-file=jsreftest/tests/user.js"]
         },
         "mochitest-1": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "2", "--this-chunk", "1", "--run-only-tests", "androidx86.json"],
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "1", "--run-only-tests", "android.json"],
         },
         "mochitest-2": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "2", "--this-chunk", "2", "--run-only-tests", "androidx86.json"],
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "2", "--run-only-tests", "android.json"],
+        },
+        "mochitest-3": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "3", "--run-only-tests", "android.json"],
+        },
+        "mochitest-4": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "4", "--run-only-tests", "android.json"],
+        },
+        "mochitest-5": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "5", "--run-only-tests", "android.json"],
+        },
+        "mochitest-6": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "6", "--run-only-tests", "android.json"],
+        },
+        "mochitest-7": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "7", "--run-only-tests", "android.json"],
+        },
+        "mochitest-8": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "8", "--run-only-tests", "android.json"],
+        },
+        "mochitest-9": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "9", "--run-only-tests", "android.json"],
+        },
+        "mochitest-10": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "10", "--this-chunk", "10", "--run-only-tests", "android.json"],
         },
         "mochitest-gl": {
             "category": "mochitest",
             "extra_args": ["--test-path", "content/canvas/test/webgl"],
         },
         "reftest-1": {
             "category": "reftest",
             "extra_args": ["--total-chunks", "3", "--this-chunk", "1",
@@ -105,37 +137,69 @@ config = {
             "extra_args": ["--total-chunks", "3", "--this-chunk", "2",
                 "tests/layout/reftests/reftest.list"]
         },
         "reftest-3": {
             "category": "reftest",
             "extra_args": ["--total-chunks", "3", "--this-chunk", "3",
                 "tests/layout/reftests/reftest.list"]
         },
-        "crashtest": {
+        "crashtest-1": {
+            "category": "reftest",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "1",
+                "tests/testing/crashtest/crashtests.list"]
+        },
+        "crashtest-2": {
             "category": "reftest",
-            "extra_args": ["tests/testing/crashtest/crashtests.list"]
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "2",
+                "tests/testing/crashtest/crashtests.list"]
+        },
+        "crashtest-3": {
+            "category": "reftest",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "3",
+                "tests/testing/crashtest/crashtests.list"]
         },
-        "xpcshell": {
+        "crashtest-4": {
+            "category": "reftest",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "4",
+                "tests/testing/crashtest/crashtests.list"]
+        },
+        "xpcshell-1": {
             "category": "xpcshell",
-            "extra_args": ["--manifest", "tests/xpcshell_android.ini"]
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "1",
+                "--manifest", "tests/xpcshell_android.ini"]
+        },
+        "xpcshell-2": {
+            "category": "xpcshell",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "2",
+                "--manifest", "tests/xpcshell_android.ini"]
+        },
+        "xpcshell-3": {
+            "category": "xpcshell",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "3",
+                "--manifest", "tests/xpcshell_android.ini"]
         },
         "robocop-1": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "1", "--robocop-path=../..",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "1", "--robocop-path=../..",
                 "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
         "robocop-2": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "2", "--robocop-path=../..",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "2", "--robocop-path=../..",
                 "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
         "robocop-3": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "3", "--robocop-path=../..",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "3", "--robocop-path=../..",
+                "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
+        },
+        "robocop-4": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "4", "--this-chunk", "4", "--robocop-path=../..",
                 "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
     }, # end of "test_definitions"
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",