infra: Remove "Goma RBE Prod" builders

These are no longer necessary now that we have migrated most builders in
Chromium to Goma RBE Prod.

Bug: 1058219
Change-Id: I8e09feef1fefdce282ec6af37cec62fe77ca85c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086373Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747073}

infra/config/buckets/goma.star

@@ -385,26 +385,6 @@ def goma_builder(*, name, builderless=False, os=os.LINUX_DEFAULT, **kwargs):
       **kwargs
   )
 
-goma_builder(
-    name = 'Chromium Android ARM 32-bit Goma RBE Prod',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Android ARM 32-bit Goma RBE Prod (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Android ARM 32-bit Goma RBE Prod (dbg)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
 goma_builder(
     name = 'Chromium Android ARM 32-bit Goma RBE Staging',
     goma_backend = goma.backend.RBE_STAGING,
@@ -422,26 +402,6 @@ goma_builder(
     goma_enable_ats = True,
 )
 
-goma_builder(
-    name = 'Chromium Linux Goma RBE Prod',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Linux Goma RBE Prod (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Linux Goma RBE Prod (dbg)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_builder(
-    name = 'Chromium Linux Goma RBE Prod (dbg) (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
 goma_builder(
     name = 'Chromium Linux Goma RBE Staging',
     goma_backend = goma.backend.RBE_STAGING,
@@ -488,11 +448,6 @@ def goma_mac_builder(*, name, **kwargs):
       **kwargs
   )
 
-goma_mac_builder(
-    name = 'Chromium Mac Goma RBE Prod',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
 goma_mac_builder(
     name = 'Chromium Mac Goma RBE Staging',
     goma_backend = goma.backend.RBE_STAGING,
@@ -527,26 +482,6 @@ def goma_windows_builder(*, name, goma_enable_ats=True, cores=32, **kwargs):
       **kwargs
   )
 
-goma_windows_builder(
-    name = 'Chromium Win Goma RBE Prod',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_windows_builder(
-    name = 'Chromium Win Goma RBE Prod (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_windows_builder(
-    name = 'Chromium Win Goma RBE Prod (dbg)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
-goma_windows_builder(
-    name = 'Chromium Win Goma RBE Prod (dbg) (clobber)',
-    goma_backend = goma.backend.RBE_PROD,
-)
-
 goma_windows_builder(
     name = 'Chromium Win Goma RBE Staging',
     goma_backend = goma.backend.RBE_STAGING,

infra/config/consoles/chromium.goma.fyi.star

@@ -4,65 +4,6 @@ luci.console_view(
     include_experimental_builds = True,
     repo = 'https://chromium.googlesource.com/chromium/src',
     entries = [
-        luci.console_view_entry(
-            builder = 'goma/Chromium Linux Goma RBE Prod',
-            category = 'prod|linux|rel',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Linux Goma RBE Prod (clobber)',
-            category = 'prod|linux|rel',
-            short_name = 'clb',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Linux Goma RBE Prod (dbg)',
-            category = 'prod|linux|dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Linux Goma RBE Prod (dbg) (clobber)',
-            category = 'prod|linux|dbg',
-            short_name = 'clb',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Mac Goma RBE Prod',
-            category = 'prod|mac|rel',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Win Goma RBE Prod',
-            category = 'prod|win|rel',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Win Goma RBE Prod (clobber)',
-            category = 'prod|win|rel',
-            short_name = 'clb',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Win Goma RBE Prod (dbg)',
-            category = 'prod|win|dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Win Goma RBE Prod (dbg) (clobber)',
-            category = 'prod|win|dbg',
-            short_name = 'clb',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Android ARM 32-bit Goma RBE Prod',
-            category = 'prod|android arm|rel',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Android ARM 32-bit Goma RBE Prod (clobber)',
-            category = 'prod|android arm|rel',
-            short_name = 'clb',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Android ARM 32-bit Goma RBE Prod (dbg)',
-            category = 'prod|android arm|dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'goma/Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)',
-            category = 'prod|android arm|dbg',
-            short_name = 'clb',
-        ),
-
         luci.console_view_entry(
             builder = 'goma/Win Builder Goma Canary',
             category = 'win|rel',

infra/config/generated/luci-milo.cfg

@@ -3947,64 +3947,6 @@ consoles: <
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Prod"
-    category: "prod|linux|rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Prod (clobber)"
-    category: "prod|linux|rel"
-    short_name: "clb"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Prod (dbg)"
-    category: "prod|linux|dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Prod (dbg) (clobber)"
-    category: "prod|linux|dbg"
-    short_name: "clb"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma RBE Prod"
-    category: "prod|mac|rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Prod"
-    category: "prod|win|rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Prod (clobber)"
-    category: "prod|win|rel"
-    short_name: "clb"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Prod (dbg)"
-    category: "prod|win|dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Prod (dbg) (clobber)"
-    category: "prod|win|dbg"
-    short_name: "clb"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE Prod"
-    category: "prod|android arm|rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-    category: "prod|android arm|rel"
-    short_name: "clb"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-    category: "prod|android arm|dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
-    category: "prod|android arm|dbg"
-    short_name: "clb"
-  >
   builders: <
     name: "buildbucket/luci.chromium.goma/Win Builder Goma Canary"
     category: "win|rel"

infra/config/generated/luci-scheduler.cfg

@@ -398,42 +398,6 @@ job: <
     builder: "Cast Audio Linux"
   >
 >
-job: <
-  id: "Chromium Android ARM 32-bit Goma RBE Prod"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Android ARM 32-bit Goma RBE Prod"
-  >
->
-job: <
-  id: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-  >
->
-job: <
-  id: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-  >
->
-job: <
-  id: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
-  >
->
 job: <
   id: "Chromium Android ARM 32-bit Goma RBE Staging"
   acl_sets: "goma"
@@ -461,42 +425,6 @@ job: <
     builder: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
   >
 >
-job: <
-  id: "Chromium Linux Goma RBE Prod"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Linux Goma RBE Prod"
-  >
->
-job: <
-  id: "Chromium Linux Goma RBE Prod (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Linux Goma RBE Prod (clobber)"
-  >
->
-job: <
-  id: "Chromium Linux Goma RBE Prod (dbg)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Linux Goma RBE Prod (dbg)"
-  >
->
-job: <
-  id: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
-  >
->
 job: <
   id: "Chromium Linux Goma RBE Staging"
   acl_sets: "goma"
@@ -560,15 +488,6 @@ job: <
     builder: "Chromium Linux Goma Staging"
   >
 >
-job: <
-  id: "Chromium Mac Goma RBE Prod"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Mac Goma RBE Prod"
-  >
->
 job: <
   id: "Chromium Mac Goma RBE Staging"
   acl_sets: "goma"
@@ -614,42 +533,6 @@ job: <
     builder: "Chromium Mac Goma Staging"
   >
 >
-job: <
-  id: "Chromium Win Goma RBE Prod"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Win Goma RBE Prod"
-  >
->
-job: <
-  id: "Chromium Win Goma RBE Prod (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Win Goma RBE Prod (clobber)"
-  >
->
-job: <
-  id: "Chromium Win Goma RBE Prod (dbg)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Win Goma RBE Prod (dbg)"
-  >
->
-job: <
-  id: "Chromium Win Goma RBE Prod (dbg) (clobber)"
-  acl_sets: "goma"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.goma"
-    builder: "Chromium Win Goma RBE Prod (dbg) (clobber)"
-  >
->
 job: <
   id: "Chromium Win Goma RBE Staging"
   acl_sets: "goma"
@@ -6560,17 +6443,9 @@ trigger: <
   triggers: "win32-archive-dbg"
   triggers: "win32-archive-rel"
   triggers: "win32-arm64-rel"
-  triggers: "Chromium Android ARM 32-bit Goma RBE Prod"
-  triggers: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-  triggers: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-  triggers: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
   triggers: "Chromium Android ARM 32-bit Goma RBE Staging"
   triggers: "Chromium Android ARM 32-bit Goma RBE ToT"
   triggers: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
-  triggers: "Chromium Linux Goma RBE Prod"
-  triggers: "Chromium Linux Goma RBE Prod (clobber)"
-  triggers: "Chromium Linux Goma RBE Prod (dbg)"
-  triggers: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
   triggers: "Chromium Linux Goma RBE Staging"
   triggers: "Chromium Linux Goma RBE Staging (clobber)"
   triggers: "Chromium Linux Goma RBE Staging (dbg)"
@@ -6578,16 +6453,11 @@ trigger: <
   triggers: "Chromium Linux Goma RBE ToT"
   triggers: "Chromium Linux Goma RBE ToT (ATS)"
   triggers: "Chromium Linux Goma Staging"
-  triggers: "Chromium Mac Goma RBE Prod"
   triggers: "Chromium Mac Goma RBE Staging"
   triggers: "Chromium Mac Goma RBE Staging (clobber)"
   triggers: "Chromium Mac Goma RBE Staging (dbg)"
   triggers: "Chromium Mac Goma RBE ToT"
   triggers: "Chromium Mac Goma Staging"
-  triggers: "Chromium Win Goma RBE Prod"
-  triggers: "Chromium Win Goma RBE Prod (clobber)"
-  triggers: "Chromium Win Goma RBE Prod (dbg)"
-  triggers: "Chromium Win Goma RBE Prod (dbg) (clobber)"
   triggers: "Chromium Win Goma RBE Staging"
   triggers: "Chromium Win Goma RBE Staging (clobber)"
   triggers: "Chromium Win Goma RBE ToT"

testing/buildbot/chromium.goma.json

@@ -206,11 +206,6 @@
       }
     ]
   },
-  "Chromium Mac Goma RBE Prod": {
-    "additional_compile_targets": [
-      "chrome"
-    ]
-  },
   "Chromium Mac Goma RBE Staging": {
     "additional_compile_targets": [
       "chrome"

testing/buildbot/waterfalls.pyl

@@ -2149,11 +2149,6 @@
       },
       # Due to disk shortage on Mac, we build 'chrome' instead of 'all'.
       # See crbug.com/899425
-      'Chromium Mac Goma RBE Prod': {
-        'additional_compile_targets': [
-          'chrome',
-        ],
-      },
       'Chromium Mac Goma RBE Staging': {
         'additional_compile_targets': [
           'chrome',

tools/mb/mb_config.pyl

@@ -337,32 +337,19 @@
       'Chromium Linux Goma RBE Staging': 'release_bot',
       'Chromium Linux Goma RBE Staging (dbg) (clobber)': 'debug_bot',
       'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
-      'Chromium Linux Goma RBE Prod': 'release_bot',
-      'Chromium Linux Goma RBE Prod (clobber)': 'release_bot',
-      'Chromium Linux Goma RBE Prod (dbg)': 'debug_bot',
-      'Chromium Linux Goma RBE Prod (dbg) (clobber)': 'debug_bot',
       'Chromium Mac Goma RBE ToT': 'release_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 Mac Goma RBE Prod': 'release_bot',
 
       # Same as CrWinGomaStaging.
       'Chromium Win Goma RBE ToT': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE Staging': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE Staging (clobber)': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (clobber)': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (dbg)': 'debug_bot_x86',
-      'Chromium Win Goma RBE Prod (dbg) (clobber)': 'debug_bot_x86',
 
       'Chromium Android ARM 32-bit Goma RBE ToT': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT (ATS)': 'android_release_bot_minimal_symbols_java_goma',
       'Chromium Android ARM 32-bit Goma RBE Staging': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (clobber)': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg)': 'android_debug_static_bot',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)': 'android_debug_static_bot',
     },
 
     'chromium.gpu': {

tools/mb/mb_config_buckets.pyl

@@ -271,16 +271,9 @@
       'win32-archive-dbg': 'debug_bot_x86',
       'win32-archive-rel': 'release_bot_x86_minimal_symbols_enable_archive_compression',
       'win32-arm64-rel': 'win32_arm64_release_bot',
-      'Chromium Android ARM 32-bit Goma RBE Prod (clobber)': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg)': 'android_debug_static_bot',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)': 'android_debug_static_bot',
       'Chromium Android ARM 32-bit Goma RBE Staging': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT (ATS)': 'android_release_bot_minimal_symbols',
-      'Chromium Linux Goma RBE Prod': 'release_bot',
-      'Chromium Linux Goma RBE Prod (clobber)': 'release_bot',
-      'Chromium Linux Goma RBE Prod (dbg)': 'debug_bot',
-      'Chromium Linux Goma RBE Prod (dbg) (clobber)': 'debug_bot',
       'Chromium Linux Goma RBE Staging': 'release_bot',
       'Chromium Linux Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
@@ -288,16 +281,11 @@
       'Chromium Linux Goma RBE ToT': 'release_bot',
       'Chromium Linux Goma RBE ToT (ATS)': 'release_bot',
       'Chromium Linux Goma Staging': 'release_bot',
-      'Chromium Mac Goma RBE Prod': 'release_bot',
       'Chromium Mac Goma RBE Staging': 'release_bot',
       'Chromium Mac Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Mac Goma RBE Staging (dbg)': 'debug_bot',
       'Chromium Mac Goma RBE ToT': 'release_bot',
       'Chromium Mac Goma Staging': 'release_bot',
-      'Chromium Win Goma RBE Prod': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (clobber)': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (dbg)': 'debug_bot_x86',
-      'Chromium Win Goma RBE Prod (dbg) (clobber)': 'debug_bot_x86',
       'Chromium Win Goma RBE Staging': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE Staging (clobber)': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE ToT': 'release_bot_x86_minimal_symbols',
@@ -572,16 +560,9 @@
     },
 
     'findit': {
-      'Chromium Android ARM 32-bit Goma RBE Prod (clobber)': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg)': 'android_debug_static_bot',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)': 'android_debug_static_bot',
       'Chromium Android ARM 32-bit Goma RBE Staging': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT (ATS)': 'android_release_bot_minimal_symbols',
-      'Chromium Linux Goma RBE Prod': 'release_bot',
-      'Chromium Linux Goma RBE Prod (clobber)': 'release_bot',
-      'Chromium Linux Goma RBE Prod (dbg)': 'debug_bot',
-      'Chromium Linux Goma RBE Prod (dbg) (clobber)': 'debug_bot',
       'Chromium Linux Goma RBE Staging': 'release_bot',
       'Chromium Linux Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
@@ -589,16 +570,11 @@
       'Chromium Linux Goma RBE ToT': 'release_bot',
       'Chromium Linux Goma RBE ToT (ATS)': 'release_bot',
       'Chromium Linux Goma Staging': 'release_bot',
-      'Chromium Mac Goma RBE Prod': 'release_bot',
       'Chromium Mac Goma RBE Staging': 'release_bot',
       'Chromium Mac Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Mac Goma RBE Staging (dbg)': 'debug_bot',
       'Chromium Mac Goma RBE ToT': 'release_bot',
       'Chromium Mac Goma Staging': 'release_bot',
-      'Chromium Win Goma RBE Prod': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (clobber)': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (dbg)': 'debug_bot_x86',
-      'Chromium Win Goma RBE Prod (dbg) (clobber)': 'debug_bot_x86',
       'Chromium Win Goma RBE Staging': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE Staging (clobber)': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE ToT': 'release_bot_x86_minimal_symbols',
@@ -911,17 +887,9 @@
     },
 
     'goma': {
-      'Chromium Android ARM 32-bit Goma RBE Prod': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (clobber)': 'android_release_bot_minimal_symbols',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg)': 'android_debug_static_bot',
-      'Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)': 'android_debug_static_bot',
       'Chromium Android ARM 32-bit Goma RBE Staging': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT': 'android_release_bot_minimal_symbols',
       'Chromium Android ARM 32-bit Goma RBE ToT (ATS)': 'android_release_bot_minimal_symbols',
-      'Chromium Linux Goma RBE Prod': 'release_bot',
-      'Chromium Linux Goma RBE Prod (clobber)': 'release_bot',
-      'Chromium Linux Goma RBE Prod (dbg)': 'debug_bot',
-      'Chromium Linux Goma RBE Prod (dbg) (clobber)': 'debug_bot',
       'Chromium Linux Goma RBE Staging': 'release_bot',
       'Chromium Linux Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
@@ -929,16 +897,11 @@
       'Chromium Linux Goma RBE ToT': 'release_bot',
       'Chromium Linux Goma RBE ToT (ATS)': 'release_bot',
       'Chromium Linux Goma Staging': 'release_bot',
-      'Chromium Mac Goma RBE Prod': 'release_bot',
       'Chromium Mac Goma RBE Staging': 'release_bot',
       'Chromium Mac Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Mac Goma RBE Staging (dbg)': 'debug_bot',
       'Chromium Mac Goma RBE ToT': 'release_bot',
       'Chromium Mac Goma Staging': 'release_bot',
-      'Chromium Win Goma RBE Prod': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (clobber)': 'release_bot_x86_minimal_symbols',
-      'Chromium Win Goma RBE Prod (dbg)': 'debug_bot_x86',
-      'Chromium Win Goma RBE Prod (dbg) (clobber)': 'debug_bot_x86',
       'Chromium Win Goma RBE Staging': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE Staging (clobber)': 'release_bot_x86_minimal_symbols',
       'Chromium Win Goma RBE ToT': 'release_bot_x86_minimal_symbols',