add "Chromium Mac Goma RBE Staging" and "Chromium Mac RBE Goma Staging (dbg)"

Bug: 901708, 901706
Change-Id: I7eaaf7434a465be2020d7e81ebf08e8d5ca93ba6
Reviewed-on: https://chromium-review.googlesource.com/c/1360452Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Shinya Kawanaka <shinyak@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614291}

infra/config/global/cr-buildbucket.cfg

@@ -2555,6 +2555,20 @@ buckets {
       mixins: "goma-ci"
       mixins: "goma-j80"
     }
+    builders {
+      name: "Chromium Mac Goma RBE Staging"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "goma-ci"
+      mixins: "goma-j80"
+    }
+    builders {
+      name: "Chromium Mac Goma RBE Staging (dbg)"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "goma-ci"
+      mixins: "goma-j80"
+    }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Staging"
       dimensions: "os:Ubuntu-14.04"

infra/config/global/luci-milo.cfg

@@ -3024,6 +3024,14 @@ consoles {
     category: "rbe|mac|rel"
     short_name: "clb"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Mac Goma RBE Staging"
+    category: "rbe|mac|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Mac Goma RBE Staging (dbg)"
+    category: "rbe|mac|debug"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Staging"
     category: "rbe|android arm|rel"

infra/config/global/luci-scheduler.cfg

@@ -112,6 +112,8 @@ trigger {
   triggers: "Chromium Mac 10.13"
   triggers: "Chromium Mac Goma GCE Staging"
   triggers: "Chromium Mac Goma RBE Staging (clobber)"
+  triggers: "Chromium Mac Goma RBE Staging (dbg)"
+  triggers: "Chromium Mac Goma RBE Staging"
   triggers: "Chromium Mac Goma Staging"
   triggers: "Chromium Windows Analyze"
   triggers: "ChromiumOS ASAN Release"
@@ -4383,6 +4385,26 @@ job {
   }
 }
 
+job {
+  id: "Chromium Mac Goma RBE Staging"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Mac Goma RBE Staging"
+  }
+}
+
+job {
+  id: "Chromium Mac Goma RBE Staging (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Mac Goma RBE Staging (dbg)"
+  }
+}
+
 job {
   id: "Chromium Mac Goma Staging"
   acl_sets: "default"

testing/buildbot/chromium.goma.json

@@ -134,9 +134,47 @@
       }
     ]
   },
+  "Chromium Mac Goma RBE Staging": {
+    "additional_compile_targets": [
+      "chrome"
+    ],
+    "gtest_tests": [
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      }
+    ]
+  },
   "Chromium Mac Goma RBE Staging (clobber)": {
     "additional_compile_targets": [
-      "all"
+      "chrome"
+    ],
+    "gtest_tests": [
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      }
+    ]
+  },
+  "Chromium Mac Goma RBE Staging (dbg)": {
+    "additional_compile_targets": [
+      "chrome"
     ],
     "gtest_tests": [
       {

testing/buildbot/waterfalls.pyl

@@ -1704,9 +1704,31 @@
           'gtest_tests': 'goma_gtests',
         },
       },
+      'Chromium Mac Goma RBE Staging': {
+        'additional_compile_targets': [
+          # Due to disk shortage, we build 'chrome' instead of 'all'.
+          # See crbug.com/899425
+          'chrome',
+        ],
+        'test_suites': {
+          'gtest_tests': 'goma_gtests',
+        },
+      },
       'Chromium Mac Goma RBE Staging (clobber)': {
         'additional_compile_targets': [
-          'all',
+          # Due to disk shortage, we build 'chrome' instead of 'all'.
+          # See crbug.com/899425
+          'chrome',
+        ],
+        'test_suites': {
+          'gtest_tests': 'goma_gtests',
+        },
+      },
+      'Chromium Mac Goma RBE Staging (dbg)': {
+        'additional_compile_targets': [
+          # Due to disk shortage, we build 'chrome' instead of 'all'.
+          # See crbug.com/899425
+          'chrome',
         ],
         'test_suites': {
           'gtest_tests': 'goma_gtests',

tools/mb/mb_config.pyl

@@ -294,6 +294,8 @@
       'Chromium Linux Goma RBE Staging (dbg) (clobber)': 'debug_bot',
       'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
       'Chromium Mac Goma RBE Staging (clobber)': 'release_bot',
+      'Chromium Mac Goma RBE Staging': 'release_bot',
+      'Chromium Mac Goma RBE Staging (dbg)': 'debug_bot',
       'Chromium Android ARM 32-bit Goma RBE Staging': 'android_release_bot_minimal_symbols',
     },