[roll] Roll Global Integration

GitOrigin-RevId: 9e59936688a1f1d36ec8ecaee157fd50e6319d5a
Change-Id: I758f3080ac9d440b53ac47b868666012761ea60d
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-asan-incremental-experimental.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-asan-incremental-experimental.textproto
deleted file mode 100644
index a329c94..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-asan-incremental-experimental.textproto
+++ /dev/null
@@ -1,29 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-optimize: DEBUG
-board: "boards/x64.gni"
-product: "products/core.gni"
-gn_args: "build_should_trace_actions = true"
-gn_args: "gocache_dir = getenv(\"TMPDIR\") + \"/gocache\""
-gn_args: "include_tests_that_fail_on_nuc_asan = false"
-gn_args: "optimize = \"sanitizer\""
-ninja_targets: "bundles:build_infra"
-ninja_targets: "bundles:test_infra"
-base_packages: "//bundles/buildbot:core"
-universe_packages: "//bundles:build_infra"
-universe_packages: "//bundles:test_infra"
-host_labels: "//bundles/buildbot:host-tests"
-target_arch: X64
-variants: "asan-ubsan"
-variants: "host_asan-ubsan"
-pave: true
-include_images: true
-include_prebuilt_binary_manifests: true
-include_host_tests: true
-test_durations_file: "prebuilt/infra/test_durations/fuchsia/core.x64-asan-incremental-experimental.json"
-default_test_durations_file: "prebuilt/infra/test_durations/fuchsia/default.json"
-use_goma: true
-incremental: true
-automatic_gen: true
-no_cleandead: true
diff --git a/infra/config/generated/fuchsia/fint_params/try/core.x64-asan-incremental-experimental.textproto b/infra/config/generated/fuchsia/fint_params/try/core.x64-asan-incremental-experimental.textproto
index 3e6984a..18d307a 100644
--- a/infra/config/generated/fuchsia/fint_params/try/core.x64-asan-incremental-experimental.textproto
+++ b/infra/config/generated/fuchsia/fint_params/try/core.x64-asan-incremental-experimental.textproto
@@ -26,5 +26,3 @@
 default_test_durations_file: "prebuilt/infra/test_durations/fuchsia/default.json"
 use_goma: true
 incremental: true
-automatic_gen: true
-no_cleandead: true
diff --git a/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental-subbuild.textproto b/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental-subbuild.textproto
deleted file mode 100644
index 4cf395d..0000000
--- a/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental-subbuild.textproto
+++ /dev/null
@@ -1,82 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Bucket message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
-
-name: "global.ci"
-acls {
-  group: "all"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:infra-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-}
-swarming {
-  builders {
-    name: "core.x64-asan-incremental-experimental-subbuild"
-    swarming_host: "chromium-swarm.appspot.com"
-    dimensions: "180:cores:64"
-    dimensions: "cpu:x64"
-    dimensions: "gce:1"
-    dimensions: "os:Linux"
-    dimensions: "pool:luci.fuchsia.ci"
-    dimensions: "role:builder"
-    exe {
-      cipd_package: "fuchsia/infra/recipe_bootstrap/${platform}"
-      cipd_version: "git_revision:e3fffe61742253e962ab81eceda7533d86910e34"
-      cmd: "luciexe"
-    }
-    properties:
-      '{'
-      '  "led_builder_is_bootstrapped": true,'
-      '  "recipe": "fuchsia/build"'
-      '}'
-    execution_timeout_secs: 8400
-    caches {
-      name: "builder"
-      path: "builder"
-    }
-    caches {
-      name: "symbol"
-      path: "symbol"
-    }
-    caches {
-      name: "fuchsia_goma_fd92a748ba1bd9900b281c1d73c58ae7cf081533a7ce19ff1c32d83ef8f4a0c7"
-      path: "goma"
-      wait_for_warm_cache_secs: 120
-    }
-    caches {
-      name: "fuchsia_incremental_fd92a748ba1bd9900b281c1d73c58ae7cf081533a7ce19ff1c32d83ef8f4a0c7"
-      path: "incremental"
-    }
-    service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-    experiments {
-      key: "luci.use_realms"
-      value: 100
-    }
-    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 {}
-      }
-    }
-  }
-}
diff --git a/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental.textproto b/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental.textproto
deleted file mode 100644
index d78c309..0000000
--- a/infra/config/generated/fuchsia/for_review_only/buildbucket/global.ci/core.x64-asan-incremental-experimental.textproto
+++ /dev/null
@@ -1,72 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Bucket message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
-
-name: "global.ci"
-acls {
-  group: "all"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:infra-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-}
-acls {
-  role: SCHEDULER
-  identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-}
-swarming {
-  builders {
-    name: "core.x64-asan-incremental-experimental"
-    swarming_host: "chromium-swarm.appspot.com"
-    dimensions: "cores:2"
-    dimensions: "cpu:x64"
-    dimensions: "gce:1"
-    dimensions: "os:Linux"
-    dimensions: "pool:luci.fuchsia.ci"
-    exe {
-      cipd_package: "fuchsia/infra/recipe_bootstrap/${platform}"
-      cipd_version: "git_revision:e3fffe61742253e962ab81eceda7533d86910e34"
-      cmd: "luciexe"
-    }
-    properties:
-      '{'
-      '  "led_builder_is_bootstrapped": true,'
-      '  "recipe": "fuchsia/fuchsia"'
-      '}'
-    execution_timeout_secs: 8400
-    caches {
-      name: "builder"
-      path: "builder"
-    }
-    caches {
-      name: "symbol"
-      path: "symbol"
-    }
-    service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-    experiments {
-      key: "luci.use_realms"
-      value: 100
-    }
-    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 {}
-      }
-    }
-  }
-}
diff --git a/infra/config/generated/fuchsia/intermediate/commit-queue-for-turquoise.cfg b/infra/config/generated/fuchsia/intermediate/commit-queue-for-turquoise.cfg
index 205d153..36e9ece 100644
--- a/infra/config/generated/fuchsia/intermediate/commit-queue-for-turquoise.cfg
+++ b/infra/config/generated/fuchsia/intermediate/commit-queue-for-turquoise.cfg
@@ -409,11 +409,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -1077,11 +1073,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -1967,11 +1959,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -2601,11 +2589,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -3235,11 +3219,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -3887,11 +3867,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -4521,11 +4497,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -5189,11 +5161,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
diff --git a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
index 4a902ca..3ea111a 100644
--- a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
@@ -7085,112 +7085,6 @@
       }
     }
     builders {
-      name: "core.x64-asan-incremental-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:2"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.ci"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_bootstrap/${platform}"
-        cipd_version: "git_revision:e3fffe61742253e962ab81eceda7533d86910e34"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/fuchsia"'
-        '}'
-      execution_timeout_secs: 8400
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      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 {}
-        }
-      }
-    }
-    builders {
-      name: "core.x64-asan-incremental-experimental-subbuild"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "180:cores:64"
-      dimensions: "cpu:x64"
-      dimensions: "gce:1"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.fuchsia.ci"
-      dimensions: "role:builder"
-      exe {
-        cipd_package: "fuchsia/infra/recipe_bootstrap/${platform}"
-        cipd_version: "git_revision:e3fffe61742253e962ab81eceda7533d86910e34"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "fuchsia/build"'
-        '}'
-      execution_timeout_secs: 8400
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      caches {
-        name: "symbol"
-        path: "symbol"
-      }
-      caches {
-        name: "fuchsia_goma_fd92a748ba1bd9900b281c1d73c58ae7cf081533a7ce19ff1c32d83ef8f4a0c7"
-        path: "goma"
-        wait_for_warm_cache_secs: 120
-      }
-      caches {
-        name: "fuchsia_incremental_fd92a748ba1bd9900b281c1d73c58ae7cf081533a7ce19ff1c32d83ef8f4a0c7"
-        path: "incremental"
-      }
-      service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      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 {}
-        }
-      }
-    }
-    builders {
       name: "core.x64-asan-kasan"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:2"
diff --git a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
index 2ec3c8f..43efe0d 100644
--- a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
+++ b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
@@ -405,11 +405,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -1073,11 +1069,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -1963,11 +1955,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -2597,11 +2585,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -3231,11 +3215,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -3883,11 +3863,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -4517,11 +4493,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
@@ -5185,11 +5157,7 @@
       }
       builders {
         name: "fuchsia/try/core.x64-asan-incremental-experimental"
-        experiment_percentage: 50
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+].*/OWNERS"
-        location_regexp_exclude: ".+/[+].*/docs/.+"
-        location_regexp_exclude: ".+/[+]/.*\\.md"
+        includable_only: true
       }
       builders {
         name: "fuchsia/try/core.x64-asan-kasan"
diff --git a/infra/config/generated/fuchsia/luci/luci-milo.cfg b/infra/config/generated/fuchsia/luci/luci-milo.cfg
index c935651..6c3ded9 100644
--- a/infra/config/generated/fuchsia/luci/luci-milo.cfg
+++ b/infra/config/generated/fuchsia/luci/luci-milo.cfg
@@ -1000,11 +1000,6 @@
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.fuchsia.global.ci/core.x64-asan-incremental-experimental"
-    category: "core|x64"
-    short_name: "asn_inc_exp"
-  }
-  builders {
     name: "buildbucket/luci.fuchsia.global.ci/core.x64-asan-kasan"
     category: "core|x64"
     short_name: "ksn"
diff --git a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
index 83fea96..b17acf6 100644
--- a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
+++ b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
@@ -890,16 +890,6 @@
   }
 }
 job {
-  id: "core.x64-asan-incremental-experimental-e5a0ec7f"
-  realm: "global.ci"
-  acl_sets: "global.ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.fuchsia.global.ci"
-    builder: "core.x64-asan-incremental-experimental"
-  }
-}
-job {
   id: "core.x64-asan-kasan-e5a0ec7f"
   realm: "global.ci"
   acl_sets: "global.ci"
@@ -2658,7 +2648,6 @@
   triggers: "core.arm64-release-flaky-e5a0ec7f"
   triggers: "core.arm64-thinlto-e5a0ec7f"
   triggers: "core.vim3-debug-fyi-e5a0ec7f"
-  triggers: "core.x64-asan-incremental-experimental-e5a0ec7f"
   triggers: "core.x64-asan-kasan-e5a0ec7f"
   triggers: "core.x64-asan-kasan-nuc_in_basic_envs-e5a0ec7f"
   triggers: "core.x64-asan-nuc_in_basic_envs-e5a0ec7f"
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental-subbuild.json b/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental-subbuild.json
deleted file mode 100644
index 0727b38..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental-subbuild.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$recipe_engine/swarming": {
-    "server": "https://chromium-swarm.appspot.com"
-  },
-  "recipe": "fuchsia/build",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-asan-incremental-experimental.textproto",
-      "incremental": true,
-      "run_tests": true,
-      "stats_gcs_bucket": "fuchsia-artifacts",
-      "upload_results": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration",
-      "upload_results": true
-    },
-    "gcs_bucket": "fuchsia-build",
-    "test": {
-      "affected_tests_multiply_threshold": 3,
-      "default_service_account": "artifact-readers@fuchsia-infra.iam.gserviceaccount.com",
-      "max_attempts": 1,
-      "max_attempts_per_test": 3,
-      "max_shards_per_env": 12,
-      "pave": true,
-      "per_test_timeout_secs": 360,
-      "pool": "fuchsia.tests",
-      "swarming_expiration_timeout_secs": 18000,
-      "swarming_io_timeout_secs": 420,
-      "target_shard_duration_secs": 540,
-      "timeout_secs": 2400,
-      "upload_results": true
-    }
-  }
-}
\ No newline at end of file
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental.json b/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental.json
deleted file mode 100644
index 434f7a8..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.x64-asan-incremental-experimental.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$recipe_engine/swarming": {
-    "server": "https://chromium-swarm.appspot.com"
-  },
-  "recipe": "fuchsia/fuchsia",
-  "spec": {
-    "artifact_gcs_bucket": "fuchsia-artifacts",
-    "build": {
-      "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-asan-incremental-experimental.textproto",
-      "incremental": true,
-      "run_tests": true,
-      "stats_gcs_bucket": "fuchsia-artifacts",
-      "upload_results": true
-    },
-    "checkout": {
-      "manifest": "flower",
-      "project": "integration",
-      "remote": "https://fuchsia.googlesource.com/integration",
-      "upload_results": true
-    },
-    "gcs_bucket": "fuchsia-build",
-    "test": {
-      "affected_tests_multiply_threshold": 3,
-      "default_service_account": "artifact-readers@fuchsia-infra.iam.gserviceaccount.com",
-      "max_attempts": 1,
-      "max_attempts_per_test": 3,
-      "max_shards_per_env": 12,
-      "pave": true,
-      "per_test_timeout_secs": 360,
-      "pool": "fuchsia.tests",
-      "swarming_expiration_timeout_secs": 18000,
-      "swarming_io_timeout_secs": 420,
-      "target_shard_duration_secs": 540,
-      "timeout_secs": 2400,
-      "upload_results": true
-    }
-  }
-}
\ No newline at end of file
diff --git a/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental-subbuild.json b/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental-subbuild.json
index 4a51d71..876c5ac 100644
--- a/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental-subbuild.json
+++ b/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental-subbuild.json
@@ -1,7 +1,4 @@
 {
-  "$fuchsia/autocorrelator": {
-    "ci_bucket": "global.ci"
-  },
   "$recipe_engine/swarming": {
     "server": "https://chromium-swarm.appspot.com"
   },
diff --git a/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental.json b/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental.json
index ab38c30..651d337 100644
--- a/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental.json
+++ b/infra/config/generated/fuchsia/properties/try/core.x64-asan-incremental-experimental.json
@@ -1,7 +1,4 @@
 {
-  "$fuchsia/autocorrelator": {
-    "ci_bucket": "global.ci"
-  },
   "$recipe_engine/swarming": {
     "server": "https://chromium-swarm.appspot.com"
   },