infra: Move Goma Mac RBE builders to use Goma RBE

They were incorrectly set to goma_backend=None.

Bug: None
Change-Id: If4a4654749ee3074b431825af39836814dab8cfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1994367Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730049}

infra/config/buckets/goma.star

@@ -178,7 +178,6 @@ fyi_goma_rbe_canary_builder(
 fyi_goma_rbe_canary_builder(
     name = 'Mac Builder (dbg) Goma RBE Canary (clobber)',
     cores = 4,
-    goma_backend = None,
     goma_jobs = goma.jobs.J80,
     os = os.MAC_DEFAULT,
 )
@@ -222,7 +221,6 @@ fyi_goma_rbe_canary_builder(
 fyi_goma_rbe_canary_builder(
     name = 'mac-archive-rel-goma-rbe-canary',
     cores = 4,
-    goma_backend = None,
     goma_jobs = goma.jobs.J80,
     os = os.MAC_DEFAULT,
 )
@@ -358,7 +356,6 @@ fyi_goma_rbe_latest_client_builder(
 fyi_goma_rbe_latest_client_builder(
     name = 'Mac Builder (dbg) Goma RBE Latest Client (clobber)',
     cores = 4,
-    goma_backend = None,
     goma_jobs = goma.jobs.J80,
     os = os.MAC_DEFAULT,
 )
@@ -416,7 +413,6 @@ fyi_goma_rbe_latest_client_builder(
 fyi_goma_rbe_latest_client_builder(
     name = 'mac-archive-rel-goma-rbe-latest',
     cores = 4,
-    goma_backend = None,
     goma_jobs = goma.jobs.J80,
     os = os.MAC_DEFAULT,
 )

infra/config/generated/cr-buildbucket.cfg

@@ -10145,7 +10145,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"jobs\":80}"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
       >
@@ -10166,7 +10166,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"jobs\":80}"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
       >
@@ -11137,7 +11137,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"jobs\":80}"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
       >
@@ -11158,7 +11158,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"jobs\":80}"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
       >