[roll] Roll Global Integration

GitOrigin-RevId: e12b08bd2806b0a3b87c9fe5807bd08c53a6148e
Change-Id: I8bbbc7fcee574bb1aba0a100472390375a106af6
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/core.arm64-debug-no_opt-build_only.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/core.arm64-debug-no_opt-build_only.textproto
deleted file mode 100644
index b4ed1e5..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/core.arm64-debug-no_opt-build_only.textproto
+++ /dev/null
@@ -1,28 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_DEBUG
-board: "boards/arm64.gni"
-product: "products/core.gni"
-gn_args: "build_should_trace_actions = true"
-gn_args: "clippy_cause_failure = true"
-gn_args: "include_clippy = true"
-gn_args: "include_rustdoc = true"
-gn_args: "truncate_build_info_commit_date = true"
-universe_packages: "//bundles/buildbot/core"
-host_labels: "//bundles/infra/build"
-target_arch: ARM64
-pave: true
-include_images: true
-include_prebuilt_binary_manifests: true
-rust_rbe_enable: true
-cxx_rbe_enable: true
-incremental: true
-include_default_ninja_target: true
-use_temporary_go_cache: true
-include_lint_targets: ALL_LINT_TARGETS
-hermetic_test_packages: "//bundles/buildbot/core:hermetic_tests"
-e2e_test_labels: "//bundles/buildbot/core:e2e_tests"
-link_rbe_enable: true
-bazel_rbe_enable: true
-build_event_service: "resultstore_infra"
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-debug-no_opt-build_only.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-debug-no_opt-build_only.textproto
deleted file mode 100644
index 182311f..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-debug-no_opt-build_only.textproto
+++ /dev/null
@@ -1,28 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_DEBUG
-board: "boards/x64.gni"
-product: "products/core.gni"
-gn_args: "build_should_trace_actions = true"
-gn_args: "clippy_cause_failure = true"
-gn_args: "include_clippy = true"
-gn_args: "include_rustdoc = true"
-gn_args: "truncate_build_info_commit_date = true"
-universe_packages: "//bundles/buildbot/core"
-host_labels: "//bundles/infra/build"
-target_arch: X64
-pave: true
-include_images: true
-include_prebuilt_binary_manifests: true
-rust_rbe_enable: true
-cxx_rbe_enable: true
-incremental: true
-include_default_ninja_target: true
-use_temporary_go_cache: true
-include_lint_targets: ALL_LINT_TARGETS
-hermetic_test_packages: "//bundles/buildbot/core:hermetic_tests"
-e2e_test_labels: "//bundles/buildbot/core:e2e_tests"
-link_rbe_enable: true
-bazel_rbe_enable: true
-build_event_service: "resultstore_infra"
diff --git a/infra/config/generated/fuchsia/fint_params/try/core.arm64-debug-no_opt-build_only.textproto b/infra/config/generated/fuchsia/fint_params/try/core.arm64-debug-no_opt-build_only.textproto
deleted file mode 100644
index b4ed1e5..0000000
--- a/infra/config/generated/fuchsia/fint_params/try/core.arm64-debug-no_opt-build_only.textproto
+++ /dev/null
@@ -1,28 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_DEBUG
-board: "boards/arm64.gni"
-product: "products/core.gni"
-gn_args: "build_should_trace_actions = true"
-gn_args: "clippy_cause_failure = true"
-gn_args: "include_clippy = true"
-gn_args: "include_rustdoc = true"
-gn_args: "truncate_build_info_commit_date = true"
-universe_packages: "//bundles/buildbot/core"
-host_labels: "//bundles/infra/build"
-target_arch: ARM64
-pave: true
-include_images: true
-include_prebuilt_binary_manifests: true
-rust_rbe_enable: true
-cxx_rbe_enable: true
-incremental: true
-include_default_ninja_target: true
-use_temporary_go_cache: true
-include_lint_targets: ALL_LINT_TARGETS
-hermetic_test_packages: "//bundles/buildbot/core:hermetic_tests"
-e2e_test_labels: "//bundles/buildbot/core:e2e_tests"
-link_rbe_enable: true
-bazel_rbe_enable: true
-build_event_service: "resultstore_infra"
diff --git a/infra/config/generated/fuchsia/fint_params/try/core.x64-debug-no_opt-build_only.textproto b/infra/config/generated/fuchsia/fint_params/try/core.x64-debug-no_opt-build_only.textproto
deleted file mode 100644
index 182311f..0000000
--- a/infra/config/generated/fuchsia/fint_params/try/core.x64-debug-no_opt-build_only.textproto
+++ /dev/null
@@ -1,28 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_DEBUG
-board: "boards/x64.gni"
-product: "products/core.gni"
-gn_args: "build_should_trace_actions = true"
-gn_args: "clippy_cause_failure = true"
-gn_args: "include_clippy = true"
-gn_args: "include_rustdoc = true"
-gn_args: "truncate_build_info_commit_date = true"
-universe_packages: "//bundles/buildbot/core"
-host_labels: "//bundles/infra/build"
-target_arch: X64
-pave: true
-include_images: true
-include_prebuilt_binary_manifests: true
-rust_rbe_enable: true
-cxx_rbe_enable: true
-incremental: true
-include_default_ninja_target: true
-use_temporary_go_cache: true
-include_lint_targets: ALL_LINT_TARGETS
-hermetic_test_packages: "//bundles/buildbot/core:hermetic_tests"
-e2e_test_labels: "//bundles/buildbot/core:e2e_tests"
-link_rbe_enable: true
-bazel_rbe_enable: true
-build_event_service: "resultstore_infra"
diff --git a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
index e316782..e7c4e7c 100644
--- a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
@@ -12931,73 +12931,6 @@
       }
     }
     builders {
-      name: "core.arm64-debug-no_opt-build_only"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:32"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.ci"
-      dimensions: "role:builder"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
-        cipd_version: "git_revision:bb16818a3f79ff7f75fafb7d545af9c4b5739535"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "is_fyi": true,'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/build",'
-        '  "recipes_host_override": "fuchsia.googlesource.com"'
-        '}'
-      execution_timeout_secs: 10200
-      expiration_secs: 21600
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      caches {
-        name: "fuchsia_incremental_00a515d003ec47d8e658a2ddb4c50bdce23b1b60a91c8f870d059bb2be3d213d"
-        path: "incremental"
-        wait_for_warm_cache_secs: 120
-      }
-      caches {
-        name: "fuchsia_rbe_00a515d003ec47d8e658a2ddb4c50bdce23b1b60a91c8f870d059bb2be3d213d"
-        path: "rbe"
-        wait_for_warm_cache_secs: 120
-      }
-      service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "ci"
-          test_results {}
-        }
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "artifacts_ci"
-          text_artifacts {}
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nOwner: tq-eng@google.com"
-      shadow_builder_adjustments {
-        service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-        pool: "luci.fuchsia.ci"
-        dimensions: "pool:luci.fuchsia.ci"
-      }
-    }
-    builders {
       name: "core.arm64-debug-subbuild"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:64"
@@ -16361,73 +16294,6 @@
       }
     }
     builders {
-      name: "core.x64-debug-no_opt-build_only"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:32"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.ci"
-      dimensions: "role:builder"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
-        cipd_version: "git_revision:bb16818a3f79ff7f75fafb7d545af9c4b5739535"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "is_fyi": true,'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/build",'
-        '  "recipes_host_override": "fuchsia.googlesource.com"'
-        '}'
-      execution_timeout_secs: 10200
-      expiration_secs: 21600
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      caches {
-        name: "fuchsia_incremental_74435d96c03f9a12ed1163bbd7f0067b3b1795095e3eccf945e80af5c741fc05"
-        path: "incremental"
-        wait_for_warm_cache_secs: 120
-      }
-      caches {
-        name: "fuchsia_rbe_74435d96c03f9a12ed1163bbd7f0067b3b1795095e3eccf945e80af5c741fc05"
-        path: "rbe"
-        wait_for_warm_cache_secs: 120
-      }
-      service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "ci"
-          test_results {}
-        }
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "artifacts_ci"
-          text_artifacts {}
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nOwner: tq-eng@google.com"
-      shadow_builder_adjustments {
-        service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-        pool: "luci.fuchsia.ci"
-        dimensions: "pool:luci.fuchsia.ci"
-      }
-    }
-    builders {
       name: "core.x64-debug-subbuild"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:64"
@@ -47500,70 +47366,6 @@
       }
     }
     builders {
-      name: "core.arm64-debug-no_opt-build_only"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:32"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.try"
-      dimensions: "role:builder"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
-        cipd_version: "git_revision:bb16818a3f79ff7f75fafb7d545af9c4b5739535"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "is_fyi": true,'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/build",'
-        '  "recipes_host_override": "fuchsia.googlesource.com"'
-        '}'
-      execution_timeout_secs: 10200
-      expiration_secs: 21600
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      caches {
-        name: "fuchsia_incremental_00a515d003ec47d8e658a2ddb4c50bdce23b1b60a91c8f870d059bb2be3d213d"
-        path: "incremental"
-        wait_for_warm_cache_secs: 120
-      }
-      caches {
-        name: "fuchsia_rbe_00a515d003ec47d8e658a2ddb4c50bdce23b1b60a91c8f870d059bb2be3d213d"
-        path: "rbe"
-        wait_for_warm_cache_secs: 120
-      }
-      service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "try"
-          test_results {}
-        }
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "artifacts_try"
-          text_artifacts {}
-        }
-      }
-      description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nThe corresponding CI builder can be found <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.arm64-debug-no_opt-build_only\">here</a>\n\nOwner: tq-eng@google.com"
-      shadow_builder_adjustments {
-        service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
-        pool: "luci.fuchsia.try"
-        dimensions: "pool:luci.fuchsia.try"
-      }
-    }
-    builders {
       name: "core.arm64-debug-subbuild"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:64"
@@ -52079,70 +51881,6 @@
       }
     }
     builders {
-      name: "core.x64-debug-no_opt-build_only"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:32"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.try"
-      dimensions: "role:builder"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
-        cipd_version: "git_revision:bb16818a3f79ff7f75fafb7d545af9c4b5739535"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "is_fyi": true,'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/build",'
-        '  "recipes_host_override": "fuchsia.googlesource.com"'
-        '}'
-      execution_timeout_secs: 10200
-      expiration_secs: 21600
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      caches {
-        name: "fuchsia_incremental_74435d96c03f9a12ed1163bbd7f0067b3b1795095e3eccf945e80af5c741fc05"
-        path: "incremental"
-        wait_for_warm_cache_secs: 120
-      }
-      caches {
-        name: "fuchsia_rbe_74435d96c03f9a12ed1163bbd7f0067b3b1795095e3eccf945e80af5c741fc05"
-        path: "rbe"
-        wait_for_warm_cache_secs: 120
-      }
-      service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "try"
-          test_results {}
-        }
-        bq_exports {
-          project: "fuchsia-infra"
-          dataset: "resultdb"
-          table: "artifacts_try"
-          text_artifacts {}
-        }
-      }
-      description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nThe corresponding CI builder can be found <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.x64-debug-no_opt-build_only\">here</a>\n\nOwner: tq-eng@google.com"
-      shadow_builder_adjustments {
-        service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
-        pool: "luci.fuchsia.try"
-        dimensions: "pool:luci.fuchsia.try"
-      }
-    }
-    builders {
       name: "core.x64-debug-subbuild"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:64"
diff --git a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
index 6adecb2..de769dd 100644
--- a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
+++ b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
@@ -741,12 +741,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -1168,12 +1162,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -2952,12 +2940,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -3379,12 +3361,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -6184,12 +6160,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -6611,12 +6581,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -9950,12 +9914,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -10377,12 +10335,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -12255,12 +12207,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -12682,12 +12628,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -15105,12 +15045,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -15532,12 +15466,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -17316,12 +17244,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -17743,12 +17665,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -19527,12 +19443,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -19954,12 +19864,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -21836,12 +21740,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -22263,12 +22161,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -24047,12 +23939,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -24474,12 +24360,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -26258,12 +26138,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -26685,12 +26559,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -28532,12 +28400,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -28959,12 +28821,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -30818,12 +30674,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -31245,12 +31095,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -33029,12 +32873,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -33456,12 +33294,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -35240,12 +35072,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -35667,12 +35493,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -37451,12 +37271,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -37878,12 +37692,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -39662,12 +39470,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -40089,12 +39891,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -41873,12 +41669,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -42300,12 +42090,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -44340,12 +44124,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.arm64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.arm64-fuzz_asan-build_only"
         includable_only: true
         disable_reuse_footers: "Depends-On"
@@ -44767,12 +44545,6 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
-        name: "fuchsia/try/core.x64-debug-no_opt-build_only"
-        includable_only: true
-        disable_reuse_footers: "Depends-On"
-        disable_reuse_footers: "Run-All-Tests"
-      }
-      builders {
         name: "fuchsia/try/core.x64-full_determinism"
         includable_only: true
         disable_reuse_footers: "Depends-On"
diff --git a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
index 0417386..85a5e84 100644
--- a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
+++ b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
@@ -1288,15 +1288,6 @@
   }
 }
 job {
-  id: "global.ci-core.arm64-debug-no_opt-build_only-e5a0ec7f"
-  realm: "global.ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "global.ci"
-    builder: "core.arm64-debug-no_opt-build_only"
-  }
-}
-job {
   id: "global.ci-core.arm64-fuzz_asan-build_only-e5a0ec7f"
   realm: "global.ci"
   buildbucket {
@@ -1567,15 +1558,6 @@
   }
 }
 job {
-  id: "global.ci-core.x64-debug-no_opt-build_only-e5a0ec7f"
-  realm: "global.ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "global.ci"
-    builder: "core.x64-debug-no_opt-build_only"
-  }
-}
-job {
   id: "global.ci-core.x64-full_determinism-e5a0ec7f"
   realm: "global.ci"
   buildbucket {
@@ -4715,7 +4697,6 @@
   triggers: "global.ci-core.arm64-cxx23-e5a0ec7f"
   triggers: "global.ci-core.arm64-debug-e5a0ec7f"
   triggers: "global.ci-core.arm64-debug-lints-build_only-e5a0ec7f"
-  triggers: "global.ci-core.arm64-debug-no_opt-build_only-e5a0ec7f"
   triggers: "global.ci-core.arm64-fuzz_asan-build_only-e5a0ec7f"
   triggers: "global.ci-core.arm64-fuzz_ubsan-build_only-e5a0ec7f"
   triggers: "global.ci-core.arm64-hwasan-e5a0ec7f"
@@ -4746,7 +4727,6 @@
   triggers: "global.ci-core.x64-debug-lacewing-e5a0ec7f"
   triggers: "global.ci-core.x64-debug-lacewing-staging-e5a0ec7f"
   triggers: "global.ci-core.x64-debug-lints-build_only-e5a0ec7f"
-  triggers: "global.ci-core.x64-debug-no_opt-build_only-e5a0ec7f"
   triggers: "global.ci-core.x64-full_determinism-e5a0ec7f"
   triggers: "global.ci-core.x64-fuzz_asan-build_only-e5a0ec7f"
   triggers: "global.ci-core.x64-fuzz_ubsan-build_only-e5a0ec7f"
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.arm64-debug-no_opt-build_only.json b/infra/config/generated/fuchsia/properties/global.ci/core.arm64-debug-no_opt-build_only.json
deleted file mode 100644
index ae3411b..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.arm64-debug-no_opt-build_only.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "$fuchsia/rbe": {
-    "instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "$fuchsia/resultstore": {
-    "cas_instance": "projects/rbe-fuchsia-prod/instances/default",
-    "project_id": "fuchsia",
-    "results_url": "http://go/fxbtx",
-    "resultstore_instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "no_python2": true,
-  "recipe": "fuchsia/build",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "enable_sandboxing": true,
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.arm64-debug-no_opt-build_only.textproto",
-      "incremental": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration"
-    }
-  }
-}
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.x64-debug-no_opt-build_only.json b/infra/config/generated/fuchsia/properties/global.ci/core.x64-debug-no_opt-build_only.json
deleted file mode 100644
index 7d8cca9..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.x64-debug-no_opt-build_only.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "$fuchsia/rbe": {
-    "instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "$fuchsia/resultstore": {
-    "cas_instance": "projects/rbe-fuchsia-prod/instances/default",
-    "project_id": "fuchsia",
-    "results_url": "http://go/fxbtx",
-    "resultstore_instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "no_python2": true,
-  "recipe": "fuchsia/build",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "enable_sandboxing": true,
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-debug-no_opt-build_only.textproto",
-      "incremental": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration"
-    }
-  }
-}
diff --git a/infra/config/generated/fuchsia/properties/try/core.arm64-debug-no_opt-build_only.json b/infra/config/generated/fuchsia/properties/try/core.arm64-debug-no_opt-build_only.json
deleted file mode 100644
index b5217e7..0000000
--- a/infra/config/generated/fuchsia/properties/try/core.arm64-debug-no_opt-build_only.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$fuchsia/autocorrelator": {
-    "ci_bucket": "global.ci"
-  },
-  "$fuchsia/rbe": {
-    "instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "$fuchsia/resultstore": {
-    "cas_instance": "projects/rbe-fuchsia-prod/instances/default",
-    "project_id": "fuchsia",
-    "results_url": "http://go/fxbtx",
-    "resultstore_instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "no_python2": true,
-  "recipe": "fuchsia/build",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "enable_sandboxing": true,
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/try/core.arm64-debug-no_opt-build_only.textproto",
-      "incremental": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration"
-    }
-  }
-}
diff --git a/infra/config/generated/fuchsia/properties/try/core.x64-debug-no_opt-build_only.json b/infra/config/generated/fuchsia/properties/try/core.x64-debug-no_opt-build_only.json
deleted file mode 100644
index fc94496..0000000
--- a/infra/config/generated/fuchsia/properties/try/core.x64-debug-no_opt-build_only.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$fuchsia/autocorrelator": {
-    "ci_bucket": "global.ci"
-  },
-  "$fuchsia/rbe": {
-    "instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "$fuchsia/resultstore": {
-    "cas_instance": "projects/rbe-fuchsia-prod/instances/default",
-    "project_id": "fuchsia",
-    "results_url": "http://go/fxbtx",
-    "resultstore_instance": "projects/rbe-fuchsia-prod/instances/default"
-  },
-  "no_python2": true,
-  "recipe": "fuchsia/build",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "enable_sandboxing": true,
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/try/core.x64-debug-no_opt-build_only.textproto",
-      "incremental": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration"
-    }
-  }
-}