Auto merge of #681 - larsbergstrom:add_mac_builders, r=Manishearth

Add mac builders

This adds more mac builders, in support of servo/servo#17003

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/681)
<!-- Reviewable:end -->

buildbot/master/files/config/master.cfg

@@ -71,9 +71,12 @@ c['schedulers'].append(schedulers.AnyBranchScheduler(
         "linux-rel-css",
         "linux-rel-wpt",
         "mac-dev-unit",
-        "mac-rel-css",
+        "mac-rel-css1",
+        "mac-rel-css2",
         "mac-rel-wpt1",
         "mac-rel-wpt2",
+        "mac-rel-wpt3",
+        "mac-rel-wpt4",
         "windows-msvc-dev",
     ],
     change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter),
@@ -98,10 +101,13 @@ c['schedulers'].append(schedulers.ForceScheduler(
         "linux-rel-intermittent",
         "mac-dev-unit",
         "mac-nightly",
-        "mac-rel-css",
+        "mac-rel-css1",
+        "mac-rel-css2",
         "mac-rel-intermittent",
         "mac-rel-wpt1",
         "mac-rel-wpt2",
+        "mac-rel-wpt3",
+        "mac-rel-wpt4",
         "windows-msvc-dev",
         "windows-msvc-nightly",
     ],
@@ -168,10 +174,13 @@ c['builders'] = [
                         envs.build_linux),
     DynamicServoBuilder("mac-dev-unit", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-nightly", MAC_SLAVES, envs.build_mac),
-    DynamicServoBuilder("mac-rel-css", MAC_SLAVES, envs.build_mac),
+    DynamicServoBuilder("mac-rel-css1", MAC_SLAVES, envs.build_mac),
+    DynamicServoBuilder("mac-rel-css2", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-rel-intermittent", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-rel-wpt1", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-rel-wpt2", MAC_SLAVES, envs.build_mac),
+    DynamicServoBuilder("mac-rel-wpt3", MAC_SLAVES, envs.build_mac),
+    DynamicServoBuilder("mac-rel-wpt4", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("windows-msvc-dev", WINDOWS_SLAVES,
                         envs.build_windows_msvc),
     DynamicServoBuilder("windows-msvc-nightly", WINDOWS_SLAVES,

homu/files/cfg.toml

@@ -165,7 +165,10 @@ builders = [
     "mac-dev-unit",
     "mac-rel-wpt1",
     "mac-rel-wpt2",
-    "mac-rel-css",
+    "mac-rel-wpt3",
+    "mac-rel-wpt4",
+    "mac-rel-css1",
+    "mac-rel-css2",
     "android",
     "arm32",
     "arm64",
@@ -178,7 +181,10 @@ try_builders = [
     "mac-dev-unit",
     "mac-rel-wpt1",
     "mac-rel-wpt2",
-    "mac-rel-css",
+    "mac-rel-wpt3",
+    "mac-rel-wpt4",
+    "mac-rel-css1",
+    "mac-rel-css2",
     "android",
     "arm32",
     "arm64",