Rebalance Mac slaves in preparation of switching to 8-core VMs.

For release, looking at the stats pages the two testers for each config should be roughly equal. For debug, it appears that this simplified configuration will make the second tester ~10 minutes slower than the first one. However they should still cycle faster the current config on the new machine.

This rebalancing should hopefully be a temporary step until we use swarming for the main waterfall.

BUG=373847
NOTRY=true

Review URL: https://codereview.chromium.org/486923004

Cr-Commit-Position: refs/heads/master@{#290714}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290714 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 96 insertions, 125 deletions

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 8464380..2fca374 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -1,44 +1,26 @@
 {
   "Mac10.6 Tests (1)": {
     "gtest_tests": [
-      "interactive_ui_tests",
       "accessibility_unittests",
+      "app_list_unittests",
       "base_unittests",
       "cacheinvalidation_unittests",
       "cast_unittests",
       "cc_unittests",
       "chromedriver_unittests",
-      "crypto_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "media_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "app_list_unittests",
-      {"test": "browser_tests", "shard_index": 0, "total_shards": 3},
-      "content_browsertests"
-    ]
-  },
-  "Mac10.6 Tests (2)": {
-    "gtest_tests": [
       "components_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "crypto_unittests",
+      "extensions_unittests",
       "gcm_unit_tests",
       "gfx_unittests",
+      "gpu_unittests",
       "google_apis_unittests",
+      "interactive_ui_tests",
       "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "ui_unittests",
-      "content_unittests",
-      {"test": "browser_tests", "shard_index": 1, "total_shards": 3}
-    ]
-  },
-  "Mac10.6 Tests (3)": {
-    "gtest_tests": [
-      "net_unittests",
+      "jingle_unittests",
+      "media_unittests",
       "message_center_unittests",
       "mojo_apps_js_unittests",
       "mojo_common_unittests",
@@ -50,51 +32,45 @@
       "mojo_application_manager_unittests",
       "mojo_shell_tests",
       "mojo_system_unittests",
+      "net_unittests",
+      "ppapi_unittests",
+      "printing_unittests",
+      "remoting_unittests",
       "sandbox_mac_unittests",
-      {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
+      "sql_unittests",
+      "sync_unit_tests",
+      "ui_unittests",
+      "unit_tests",
+      "url_unittests"
+    ]
+  },
+  "Mac10.6 Tests (2)": {
+    "gtest_tests": [
+      "browser_tests"
     ]
   },
   "Mac10.7 Tests (1)": {
     "gtest_tests": [
-      "interactive_ui_tests",
       "accessibility_unittests",
+      "app_list_unittests",
       "base_unittests",
       "cacheinvalidation_unittests",
       "cast_unittests",
       "cc_unittests",
       "chromedriver_unittests",
+      "components_unittests",
+      "content_browsertests",
+      "content_unittests",
       "crypto_unittests",
       "extensions_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "media_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "app_list_unittests",
-      {"test": "browser_tests", "shard_index": 0, "total_shards": 3},
-      "content_browsertests"
-    ]
-  },
-  "Mac10.7 Tests (2)": {
-    "gtest_tests": [
-      "components_unittests",
       "gcm_unit_tests",
       "gfx_unittests",
+      "gpu_unittests",
       "google_apis_unittests",
+      "interactive_ui_tests",
       "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "ui_unittests",
-      "content_unittests",
-      {"test": "browser_tests", "shard_index": 1, "total_shards": 3}
-    ]
-  },
-  "Mac10.7 Tests (3)": {
-    "gtest_tests": [
-      "net_unittests",
+      "jingle_unittests",
+      "media_unittests",
       "message_center_unittests",
       "mojo_apps_js_unittests",
       "mojo_common_unittests",
@@ -106,56 +82,46 @@
       "mojo_application_manager_unittests",
       "mojo_shell_tests",
       "mojo_system_unittests",
-      "sandbox_mac_unittests",
-      {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
-    ]
-  },
-  "Mac 10.6 Tests (dbg)(1)": {
-    "gtest_tests": [
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "crypto_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
+      "net_unittests",
       "ppapi_unittests",
       "printing_unittests",
       "remoting_unittests",
-      {"test": "browser_tests", "shard_index": 0, "total_shards": 4},
-      "content_browsertests"
+      "sandbox_mac_unittests",
+      "sql_unittests",
+      "sync_unit_tests",
+      "ui_unittests",
+      "unit_tests",
+      "url_unittests"
     ]
   },
-  "Mac 10.6 Tests (dbg)(2)": {
+  "Mac10.7 Tests (2)": {
     "gtest_tests": [
-      "gfx_unittests",
-      "media_unittests",
-      "net_unittests",
-      "sandbox_mac_unittests",
-      {"test": "browser_tests", "shard_index": 1, "total_shards": 4}
+      "browser_tests"
     ]
   },
-  "Mac 10.6 Tests (dbg)(3)": {
+  "Mac 10.6 Tests (dbg)(1)": {
     "gtest_tests": [
-      "interactive_ui_tests",
       "accessibility_unittests",
+      "app_list_unittests",
       "base_unittests",
-      {"test": "browser_tests", "shard_index": 2, "total_shards": 4}
-    ]
-  },
-  "Mac 10.6 Tests (dbg)(4)": {
-    "gtest_tests": [
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chromedriver_unittests",
       "components_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "crypto_unittests",
+      "extensions_unittests",
       "gcm_unit_tests",
+      "gfx_unittests",
+      "gpu_unittests",
       "google_apis_unittests",
-      "message_center_unittests",
+      "interactive_ui_tests",
       "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "ui_unittests",
-      "content_unittests",
+      "jingle_unittests",
+      "media_unittests",
+      "message_center_unittests",
       "mojo_apps_js_unittests",
       "mojo_common_unittests",
       "mojo_js_unittests",
@@ -166,55 +132,46 @@
       "mojo_application_manager_unittests",
       "mojo_shell_tests",
       "mojo_system_unittests",
-      {"test": "browser_tests", "shard_index": 3, "total_shards": 4}
-    ]
-  },
-  "Mac 10.7 Tests (dbg)(1)": {
-    "gtest_tests": [
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "crypto_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
+      "net_unittests",
       "ppapi_unittests",
       "printing_unittests",
       "remoting_unittests",
-      {"test": "browser_tests", "shard_index": 0, "total_shards": 4},
-      "content_browsertests"
+      "sandbox_mac_unittests",
+      "sql_unittests",
+      "sync_unit_tests",
+      "ui_unittests",
+      "unit_tests",
+      "url_unittests"
     ]
   },
-  "Mac 10.7 Tests (dbg)(2)": {
+  "Mac 10.6 Tests (dbg)(2)": {
     "gtest_tests": [
-      "gfx_unittests",
-      "media_unittests",
-      "net_unittests",
-      "sandbox_mac_unittests",
-      {"test": "browser_tests", "shard_index": 1, "total_shards": 4}
+      "browser_tests"
     ]
   },
-  "Mac 10.7 Tests (dbg)(3)": {
+  "Mac 10.7 Tests (dbg)(1)": {
     "gtest_tests": [
-      "interactive_ui_tests",
       "accessibility_unittests",
+      "app_list_unittests",
       "base_unittests",
-      {"test": "browser_tests", "shard_index": 2, "total_shards": 4}
-    ]
-  },
-  "Mac 10.7 Tests (dbg)(4)": {
-    "gtest_tests": [
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chromedriver_unittests",
       "components_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "crypto_unittests",
+      "extensions_unittests",
       "gcm_unit_tests",
+      "gfx_unittests",
+      "gpu_unittests",
       "google_apis_unittests",
-      "message_center_unittests",
+      "interactive_ui_tests",
       "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "ui_unittests",
-      "content_unittests",
+      "jingle_unittests",
+      "media_unittests",
+      "message_center_unittests",
       "mojo_apps_js_unittests",
       "mojo_common_unittests",
       "mojo_js_unittests",
@@ -225,7 +182,21 @@
       "mojo_application_manager_unittests",
       "mojo_shell_tests",
       "mojo_system_unittests",
-      {"test": "browser_tests", "shard_index": 3, "total_shards": 4}
+      "net_unittests",
+      "ppapi_unittests",
+      "printing_unittests",
+      "remoting_unittests",
+      "sandbox_mac_unittests",
+      "sql_unittests",
+      "sync_unit_tests",
+      "ui_unittests",
+      "unit_tests",
+      "url_unittests"
+    ]
+  },
+  "Mac 10.7 Tests (dbg)(2)": {
+    "gtest_tests": [
+      "browser_tests"
     ]
   }
 }