[roll] Roll the config repository

GitOrigin-RevId: f4abade99f49566c3d75e6efc162b25175f47aaa
Change-Id: I267d95cde0c44c0d2f4806fadbc3a43637c4a612
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/builder.textproto b/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/builder.textproto
deleted file mode 100644
index 92b8cf3..0000000
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/builder.textproto
+++ /dev/null
@@ -1,83 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Bucket message:
-#   https://config.luci.app/schemas/projects:buildbucket.cfg
-
-name: "tools.roll"
-swarming {
-  builders {
-    name: "clang-roller-dryrun"
-    swarming_host: "chromium-swarm.appspot.com"
-    dimensions: "3600:cores:1|2|4"
-    dimensions: "cpu:x64|x86-64"
-    dimensions: "os:Debian"
-    dimensions: "pool:luci.pigweed.roll"
-    exe {
-      cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
-      cipd_version: "refs/heads/main"
-      cmd: "luciexe"
-    }
-    properties:
-      '{'
-      '  "auto_roller_options": {'
-      '    "add_gitwatcher_ignore": true,'
-      '    "bot_commit": true,'
-      '    "dry_run": true,'
-      '    "force_submit": false,'
-      '    "labels_to_set": null,'
-      '    "labels_to_wait_on": [],'
-      '    "permit_recommended": false,'
-      '    "poll_interval_secs": 90,'
-      '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-      '    "upstream_ref": "main"'
-      '  },'
-      '  "checkout_options": {'
-      '    "branch": "main",'
-      '    "equivalent_remotes": [],'
-      '    "initialize_submodules": false,'
-      '    "match_branch": true,'
-      '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-      '    "use_repo": false,'
-      '    "use_trigger": true'
-      '  },'
-      '  "cipd_packages": ['
-      '    {'
-      '      "allow_mismatched_refs": false,'
-      '      "allowed_package_uploaders": ['
-      '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-      '      ],'
-      '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-      '      "name": "clang",'
-      '      "ref": "integration",'
-      '      "spec": "fuchsia/third_party/clang/${platform}",'
-      '      "split_names": ['
-      '        "fuchsia",'
-      '        "third_party",'
-      '        "clang"'
-      '      ],'
-      '      "tag": "git_revision"'
-      '    }'
-      '  ],'
-      '  "do_not_bisect": true,'
-      '  "do_not_rerun": true,'
-      '  "dry_run": true,'
-      '  "forge_author": true,'
-      '  "recipe": "roller"'
-      '}'
-    priority: 40
-    execution_timeout_secs: 7920
-    caches {
-      name: "builder"
-      path: "builder"
-    }
-    service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-    shadow_builder_adjustments {
-      service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-      pool: "luci.pigweed.try"
-      dimensions: "pool:luci.pigweed.try"
-    }
-    max_concurrent_builds: 1
-  }
-}
-shadow: "tools.roll.shadow"
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/description.html b/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/description.html
deleted file mode 100644
index ec60ccd..0000000
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller-dryrun/description.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Corresponding builders in other buckets:<ul>
-<li><a href="https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller">tools.roll / clang-roller</a></li>
-<li>tools.roll / clang-roller-dryrun</li>
-</ul>
-<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller-dryrun">Schedule a new build</a></p>
-<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x">Trigger a gitiles poll</a></p>
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/builder.textproto b/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/builder.textproto
deleted file mode 100644
index b3c528d..0000000
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/builder.textproto
+++ /dev/null
@@ -1,83 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Bucket message:
-#   https://config.luci.app/schemas/projects:buildbucket.cfg
-
-name: "tools.roll"
-swarming {
-  builders {
-    name: "clang-roller"
-    swarming_host: "chromium-swarm.appspot.com"
-    dimensions: "3600:cores:1|2|4"
-    dimensions: "cpu:x64|x86-64"
-    dimensions: "os:Debian"
-    dimensions: "pool:luci.pigweed.roll"
-    exe {
-      cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
-      cipd_version: "refs/heads/main"
-      cmd: "luciexe"
-    }
-    properties:
-      '{'
-      '  "auto_roller_options": {'
-      '    "add_gitwatcher_ignore": true,'
-      '    "bot_commit": true,'
-      '    "dry_run": false,'
-      '    "force_submit": false,'
-      '    "labels_to_set": null,'
-      '    "labels_to_wait_on": [],'
-      '    "permit_recommended": false,'
-      '    "poll_interval_secs": 90,'
-      '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-      '    "upstream_ref": "main"'
-      '  },'
-      '  "checkout_options": {'
-      '    "branch": "main",'
-      '    "equivalent_remotes": [],'
-      '    "initialize_submodules": false,'
-      '    "match_branch": true,'
-      '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-      '    "use_repo": false,'
-      '    "use_trigger": true'
-      '  },'
-      '  "cipd_packages": ['
-      '    {'
-      '      "allow_mismatched_refs": false,'
-      '      "allowed_package_uploaders": ['
-      '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-      '      ],'
-      '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-      '      "name": "clang",'
-      '      "ref": "integration",'
-      '      "spec": "fuchsia/third_party/clang/${platform}",'
-      '      "split_names": ['
-      '        "fuchsia",'
-      '        "third_party",'
-      '        "clang"'
-      '      ],'
-      '      "tag": "git_revision"'
-      '    }'
-      '  ],'
-      '  "do_not_bisect": false,'
-      '  "do_not_rerun": false,'
-      '  "dry_run": false,'
-      '  "forge_author": true,'
-      '  "recipe": "roller"'
-      '}'
-    priority: 40
-    execution_timeout_secs: 7920
-    caches {
-      name: "builder"
-      path: "builder"
-    }
-    service_account: "pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com"
-    shadow_builder_adjustments {
-      service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-      pool: "luci.pigweed.try"
-      dimensions: "pool:luci.pigweed.try"
-    }
-    max_concurrent_builds: 1
-  }
-}
-shadow: "tools.roll.shadow"
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/description.html b/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/description.html
deleted file mode 100644
index 1b1061a..0000000
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/clang-roller/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Corresponding builders in other buckets:<ul>
-<li>tools.roll / clang-roller</li>
-<li><a href="https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller-dryrun">tools.roll / clang-roller-dryrun</a></li>
-</ul>
-<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller">Schedule a new build</a></p>
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/description.html b/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/description.html
deleted file mode 100644
index 8c9ef16..0000000
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/description.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rust-roller-dryrun">Schedule a new build</a></p>
-<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x">Trigger a gitiles poll</a></p>
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/builder.textproto
similarity index 77%
rename from generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto
rename to generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/builder.textproto
index 57fbe40..136d7ab 100644
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/builder.textproto
@@ -7,7 +7,7 @@
 name: "tools.roll"
 swarming {
   builders {
-    name: "rust-roller-dryrun"
+    name: "toolchain-roller-dryrun"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "3600:cores:1|2|4"
     dimensions: "cpu:x64|x86-64"
@@ -57,7 +57,7 @@
       '        "rust",'
       '        "host"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -75,7 +75,7 @@
       '        "target",'
       '        "aarch64-unknown-linux-gnu"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -93,7 +93,7 @@
       '        "target",'
       '        "x86_64-unknown-linux-gnu"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -111,7 +111,7 @@
       '        "target",'
       '        "aarch64-apple-darwin"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -129,7 +129,7 @@
       '        "target",'
       '        "x86_64-apple-darwin"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -147,6 +147,44 @@
       '        "target",'
       '        "thumbv7m-none-eabi"'
       '      ],'
+      '      "tag": "git_revisions"'
+      '    },'
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": ['
+      '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+      '      ],'
+      '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+      '      "name": "clang",'
+      '      "ref": "integration",'
+      '      "spec": "fuchsia/third_party/clang/${platform}",'
+      '      "split_names": ['
+      '        "fuchsia",'
+      '        "third_party",'
+      '        "clang"'
+      '      ],'
+      '      "tag": "git_revision"'
+      '    }'
+      '  ],'
+      '  "cipd_variables": ['
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": [],'
+      '      "comment_prefix": null,'
+      '      "name": "RUST_VERSION",'
+      '      "path": "MODULE.bazel",'
+      '      "ref": "latest",'
+      '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+      '      "tag": "git_revisions"'
+      '    },'
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": [],'
+      '      "comment_prefix": null,'
+      '      "name": "LLVM_VERSION",'
+      '      "path": "MODULE.bazel",'
+      '      "ref": "latest",'
+      '      "spec": "fuchsia/third_party/clang/${platform}",'
       '      "tag": "git_revision"'
       '    }'
       '  ],'
@@ -154,17 +192,19 @@
       '  "do_not_rerun": true,'
       '  "dry_run": true,'
       '  "forge_author": true,'
-      '  "header_override": "rust",'
+      '  "header_override": "toolchain",'
+      '  "module_bazel_lock_entries": ['
+      '    {}'
+      '  ],'
       '  "recipe": "roller"'
       '}'
-    priority: 50
+    priority: 40
     execution_timeout_secs: 7920
     caches {
       name: "builder"
       path: "builder"
     }
     service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-    experimental: YES
     shadow_builder_adjustments {
       service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
       pool: "luci.pigweed.try"
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/description.html b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/description.html
new file mode 100644
index 0000000..906e28d
--- /dev/null
+++ b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller-dryrun/description.html
@@ -0,0 +1,6 @@
+Corresponding builders in other buckets:<ul>
+<li><a href="https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller">tools.roll / toolchain-roller</a></li>
+<li>tools.roll / toolchain-roller-dryrun</li>
+</ul>
+<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller-dryrun">Schedule a new build</a></p>
+<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x">Trigger a gitiles poll</a></p>
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/builder.textproto
similarity index 75%
copy from generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto
copy to generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/builder.textproto
index 57fbe40..6bfd803 100644
--- a/generated/pigweed/for_review_only/buildbucket/tools.roll/rust-roller-dryrun/builder.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/builder.textproto
@@ -7,7 +7,7 @@
 name: "tools.roll"
 swarming {
   builders {
-    name: "rust-roller-dryrun"
+    name: "toolchain-roller"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "3600:cores:1|2|4"
     dimensions: "cpu:x64|x86-64"
@@ -23,7 +23,7 @@
       '  "auto_roller_options": {'
       '    "add_gitwatcher_ignore": true,'
       '    "bot_commit": true,'
-      '    "dry_run": true,'
+      '    "dry_run": false,'
       '    "force_submit": false,'
       '    "labels_to_set": null,'
       '    "labels_to_wait_on": [],'
@@ -57,7 +57,7 @@
       '        "rust",'
       '        "host"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -75,7 +75,7 @@
       '        "target",'
       '        "aarch64-unknown-linux-gnu"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -93,7 +93,7 @@
       '        "target",'
       '        "x86_64-unknown-linux-gnu"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -111,7 +111,7 @@
       '        "target",'
       '        "aarch64-apple-darwin"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -129,7 +129,7 @@
       '        "target",'
       '        "x86_64-apple-darwin"'
       '      ],'
-      '      "tag": "git_revision"'
+      '      "tag": "git_revisions"'
       '    },'
       '    {'
       '      "allow_mismatched_refs": false,'
@@ -147,24 +147,64 @@
       '        "target",'
       '        "thumbv7m-none-eabi"'
       '      ],'
+      '      "tag": "git_revisions"'
+      '    },'
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": ['
+      '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+      '      ],'
+      '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+      '      "name": "clang",'
+      '      "ref": "integration",'
+      '      "spec": "fuchsia/third_party/clang/${platform}",'
+      '      "split_names": ['
+      '        "fuchsia",'
+      '        "third_party",'
+      '        "clang"'
+      '      ],'
       '      "tag": "git_revision"'
       '    }'
       '  ],'
-      '  "do_not_bisect": true,'
-      '  "do_not_rerun": true,'
-      '  "dry_run": true,'
+      '  "cipd_variables": ['
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": [],'
+      '      "comment_prefix": null,'
+      '      "name": "RUST_VERSION",'
+      '      "path": "MODULE.bazel",'
+      '      "ref": "latest",'
+      '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+      '      "tag": "git_revisions"'
+      '    },'
+      '    {'
+      '      "allow_mismatched_refs": false,'
+      '      "allowed_package_uploaders": [],'
+      '      "comment_prefix": null,'
+      '      "name": "LLVM_VERSION",'
+      '      "path": "MODULE.bazel",'
+      '      "ref": "latest",'
+      '      "spec": "fuchsia/third_party/clang/${platform}",'
+      '      "tag": "git_revision"'
+      '    }'
+      '  ],'
+      '  "do_not_bisect": false,'
+      '  "do_not_rerun": false,'
+      '  "dry_run": false,'
       '  "forge_author": true,'
-      '  "header_override": "rust",'
+      '  "header_override": "toolchain",'
+      '  "module_bazel_lock_entries": ['
+      '    {}'
+      '  ],'
       '  "recipe": "roller"'
       '}'
-    priority: 50
+    priority: 40
     execution_timeout_secs: 7920
     caches {
       name: "builder"
       path: "builder"
     }
-    service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-    experimental: YES
+    service_account: "pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com"
     shadow_builder_adjustments {
       service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
       pool: "luci.pigweed.try"
diff --git a/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/description.html b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/description.html
new file mode 100644
index 0000000..0f6b14e
--- /dev/null
+++ b/generated/pigweed/for_review_only/buildbucket/tools.roll/toolchain-roller/description.html
@@ -0,0 +1,5 @@
+Corresponding builders in other buckets:<ul>
+<li>tools.roll / toolchain-roller</li>
+<li><a href="https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller-dryrun">tools.roll / toolchain-roller-dryrun</a></li>
+</ul>
+<p><a href="https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller">Schedule a new build</a></p>
diff --git a/generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller-dryrun.textproto b/generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller-dryrun.textproto
similarity index 94%
rename from generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller-dryrun.textproto
rename to generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller-dryrun.textproto
index ff5bf86..dfe35ae 100644
--- a/generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller-dryrun.textproto
+++ b/generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller-dryrun.textproto
@@ -22,6 +22,6 @@
 }
 builders {
   bucket: "tools.roll"
-  name: "clang-roller-dryrun"
+  name: "toolchain-roller-dryrun"
   repository: "https://pigweed.googlesource.com/pigweed/pigweed"
 }
diff --git a/generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller.textproto b/generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller.textproto
similarity index 95%
rename from generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller.textproto
rename to generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller.textproto
index ed5f9a7..c496f67 100644
--- a/generated/pigweed/for_review_only/luci-notify/tools.roll/clang-roller.textproto
+++ b/generated/pigweed/for_review_only/luci-notify/tools.roll/toolchain-roller.textproto
@@ -22,5 +22,5 @@
 }
 builders {
   bucket: "tools.roll"
-  name: "clang-roller"
+  name: "toolchain-roller"
 }
diff --git a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun
deleted file mode 100644
index 15b0a56..0000000
--- a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun
+++ /dev/null
@@ -1,13 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Job message:
-#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
-
-id: "tools.roll-clang-roller-dryrun"
-realm: "tools.roll"
-buildbucket {
-  server: "cr-buildbucket.appspot.com"
-  bucket: "tools.roll"
-  builder: "clang-roller-dryrun"
-}
diff --git a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x
deleted file mode 100644
index e675dcc..0000000
--- a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller-dryrun/tools.roll-clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x
+++ /dev/null
@@ -1,15 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Trigger message:
-#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
-
-id: "clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x"
-realm: "tools.roll"
-schedule: "0 53 11 * * 0 *"
-triggers: "tools.roll-clang-roller-dryrun"
-gitiles {
-  repo: "https://pigweed.googlesource.com/pigweed/pigweed"
-  refs: "regexp:refs/heads/main"
-  path_regexps: ".*"
-}
diff --git a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun
similarity index 77%
rename from generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun
rename to generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun
index f74411c..cec06b3 100644
--- a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun
+++ b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun
@@ -4,10 +4,10 @@
 # For the schema of this file, see Job message:
 #   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
-id: "tools.roll-rust-roller-dryrun"
+id: "tools.roll-toolchain-roller-dryrun"
 realm: "tools.roll"
 buildbucket {
   server: "cr-buildbucket.appspot.com"
   bucket: "tools.roll"
-  builder: "rust-roller-dryrun"
+  builder: "toolchain-roller-dryrun"
 }
diff --git a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x
similarity index 69%
rename from generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x
rename to generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x
index ff0877d..8dc583e 100644
--- a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/rust-roller-dryrun/tools.roll-rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x
+++ b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller-dryrun/tools.roll-toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x
@@ -4,10 +4,10 @@
 # For the schema of this file, see Trigger message:
 #   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
-id: "rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x"
+id: "toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x"
 realm: "tools.roll"
-schedule: "0 43 14 * * 0 *"
-triggers: "tools.roll-rust-roller-dryrun"
+schedule: "0 55 19 * * 0 *"
+triggers: "tools.roll-toolchain-roller-dryrun"
 gitiles {
   repo: "https://pigweed.googlesource.com/pigweed/pigweed"
   refs: "regexp:refs/heads/main"
diff --git a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller/tools.roll-clang-roller b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller/tools.roll-toolchain-roller
similarity index 81%
rename from generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller/tools.roll-clang-roller
rename to generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller/tools.roll-toolchain-roller
index 5176c63..eed4699 100644
--- a/generated/pigweed/for_review_only/luci-scheduler/tools.roll/clang-roller/tools.roll-clang-roller
+++ b/generated/pigweed/for_review_only/luci-scheduler/tools.roll/toolchain-roller/tools.roll-toolchain-roller
@@ -4,11 +4,11 @@
 # For the schema of this file, see Job message:
 #   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
-id: "tools.roll-clang-roller"
+id: "tools.roll-toolchain-roller"
 realm: "tools.roll"
 schedule: "triggered"
 buildbucket {
   server: "cr-buildbucket.appspot.com"
   bucket: "tools.roll"
-  builder: "clang-roller"
+  builder: "toolchain-roller"
 }
diff --git a/generated/pigweed/for_review_only/viz/sanitized/tools/Name.md b/generated/pigweed/for_review_only/viz/sanitized/tools/Name.md
index 9d59f5e..1ae9720 100644
--- a/generated/pigweed/for_review_only/viz/sanitized/tools/Name.md
+++ b/generated/pigweed/for_review_only/viz/sanitized/tools/Name.md
@@ -17,8 +17,6 @@
 | **bloaty-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/bloaty-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-bloaty-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **buildifier-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/buildifier-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-buildifier-roller)* |
 | **buildifier-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/buildifier-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-buildifier-roller-dryrun)*<br/>pigweed-try-builder@psa |
-| **clang-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller)* |
-| **clang-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **cmake-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/cmake-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-cmake-roller)* |
 | **cmake-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/cmake-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-cmake-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **coverage-uploader-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/coverage-uploader-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-coverage-uploader-roller)* |
@@ -44,8 +42,9 @@
 | **qemu-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/qemu-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-qemu-roller)* |
 | **qemu-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/qemu-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-qemu-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **rbe-client-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/rbe-client-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rbe-client-roller-dryrun)*<br/>*experimental*<br/>pigweed-try-builder@psa |
-| **rust-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/rust-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rust-roller-dryrun)*<br/>*experimental*<br/>pigweed-try-builder@psa |
 | **sysroot-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/sysroot-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-sysroot-roller)* |
 | **sysroot-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/sysroot-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-sysroot-roller-dryrun)*<br/>pigweed-try-builder@psa |
+| **toolchain-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller)* |
+| **toolchain-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **zephyr-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/zephyr-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-zephyr-roller)* |
 | **zephyr-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/zephyr-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-zephyr-roller-dryrun)*<br/>pigweed-try-builder@psa |
diff --git a/generated/pigweed/for_review_only/viz/sanitized/tools/roll.md b/generated/pigweed/for_review_only/viz/sanitized/tools/roll.md
index ded0056..d5af354 100644
--- a/generated/pigweed/for_review_only/viz/sanitized/tools/roll.md
+++ b/generated/pigweed/for_review_only/viz/sanitized/tools/roll.md
@@ -17,8 +17,6 @@
 | **bloaty-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/bloaty-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-bloaty-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **buildifier-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/buildifier-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-buildifier-roller)* |
 | **buildifier-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/buildifier-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-buildifier-roller-dryrun)*<br/>pigweed-try-builder@psa |
-| **clang-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller)* |
-| **clang-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **cmake-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/cmake-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-cmake-roller)* |
 | **cmake-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/cmake-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-cmake-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **coverage-uploader-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/coverage-uploader-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-coverage-uploader-roller)* |
@@ -44,8 +42,9 @@
 | **qemu-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/qemu-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-qemu-roller)* |
 | **qemu-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/qemu-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-qemu-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **rbe-client-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/rbe-client-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rbe-client-roller-dryrun)*<br/>*experimental*<br/>pigweed-try-builder@psa |
-| **rust-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/rust-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rust-roller-dryrun)*<br/>*experimental*<br/>pigweed-try-builder@psa |
 | **sysroot-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/sysroot-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-sysroot-roller)* |
 | **sysroot-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/sysroot-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-sysroot-roller-dryrun)*<br/>pigweed-try-builder@psa |
+| **toolchain-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller)* |
+| **toolchain-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller-dryrun)*<br/>pigweed-try-builder@psa |
 | **zephyr-roller** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/zephyr-roller)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-zephyr-roller)* |
 | **zephyr-roller-dryrun** | **[roll](https://ci.chromium.org/p/pigweed/builders/tools.roll/zephyr-roller-dryrun)**<br/>*[scheduler](https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-zephyr-roller-dryrun)*<br/>pigweed-try-builder@psa |
diff --git a/generated/pigweed/luci/cr-buildbucket.cfg b/generated/pigweed/luci/cr-buildbucket.cfg
index 3be2bcc..5f322fc 100644
--- a/generated/pigweed/luci/cr-buildbucket.cfg
+++ b/generated/pigweed/luci/cr-buildbucket.cfg
@@ -38852,154 +38852,6 @@
       max_concurrent_builds: 1
     }
     builders {
-      name: "clang-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "3600:cores:1|2|4"
-      dimensions: "cpu:x64|x86-64"
-      dimensions: "os:Debian"
-      dimensions: "pool:luci.pigweed.roll"
-      exe {
-        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "auto_roller_options": {'
-        '    "add_gitwatcher_ignore": true,'
-        '    "bot_commit": true,'
-        '    "dry_run": false,'
-        '    "force_submit": false,'
-        '    "labels_to_set": null,'
-        '    "labels_to_wait_on": [],'
-        '    "permit_recommended": false,'
-        '    "poll_interval_secs": 90,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "upstream_ref": "main"'
-        '  },'
-        '  "checkout_options": {'
-        '    "branch": "main",'
-        '    "equivalent_remotes": [],'
-        '    "initialize_submodules": false,'
-        '    "match_branch": true,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "use_repo": false,'
-        '    "use_trigger": true'
-        '  },'
-        '  "cipd_packages": ['
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "clang",'
-        '      "ref": "integration",'
-        '      "spec": "fuchsia/third_party/clang/${platform}",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "clang"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    }'
-        '  ],'
-        '  "do_not_bisect": false,'
-        '  "do_not_rerun": false,'
-        '  "dry_run": false,'
-        '  "forge_author": true,'
-        '  "recipe": "roller"'
-        '}'
-      priority: 40
-      execution_timeout_secs: 7920
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      service_account: "pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com"
-      description_html: "Corresponding builders in other buckets:<ul>\n<li>tools.roll / clang-roller</li>\n<li><a href=\"https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller-dryrun\">tools.roll / clang-roller-dryrun</a></li>\n</ul>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller\">Schedule a new build</a></p>\n"
-      shadow_builder_adjustments {
-        service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.pigweed.try"
-        dimensions: "pool:luci.pigweed.try"
-      }
-      max_concurrent_builds: 1
-    }
-    builders {
-      name: "clang-roller-dryrun"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "3600:cores:1|2|4"
-      dimensions: "cpu:x64|x86-64"
-      dimensions: "os:Debian"
-      dimensions: "pool:luci.pigweed.roll"
-      exe {
-        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "auto_roller_options": {'
-        '    "add_gitwatcher_ignore": true,'
-        '    "bot_commit": true,'
-        '    "dry_run": true,'
-        '    "force_submit": false,'
-        '    "labels_to_set": null,'
-        '    "labels_to_wait_on": [],'
-        '    "permit_recommended": false,'
-        '    "poll_interval_secs": 90,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "upstream_ref": "main"'
-        '  },'
-        '  "checkout_options": {'
-        '    "branch": "main",'
-        '    "equivalent_remotes": [],'
-        '    "initialize_submodules": false,'
-        '    "match_branch": true,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "use_repo": false,'
-        '    "use_trigger": true'
-        '  },'
-        '  "cipd_packages": ['
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "clang",'
-        '      "ref": "integration",'
-        '      "spec": "fuchsia/third_party/clang/${platform}",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "clang"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    }'
-        '  ],'
-        '  "do_not_bisect": true,'
-        '  "do_not_rerun": true,'
-        '  "dry_run": true,'
-        '  "forge_author": true,'
-        '  "recipe": "roller"'
-        '}'
-      priority: 40
-      execution_timeout_secs: 7920
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-      description_html: "Corresponding builders in other buckets:<ul>\n<li><a href=\"https://ci.chromium.org/p/pigweed/builders/tools.roll/clang-roller\">tools.roll / clang-roller</a></li>\n<li>tools.roll / clang-roller-dryrun</li>\n</ul>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-clang-roller-dryrun\">Schedule a new build</a></p>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x\">Trigger a gitiles poll</a></p>\n"
-      shadow_builder_adjustments {
-        service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.pigweed.try"
-        dimensions: "pool:luci.pigweed.try"
-      }
-      max_concurrent_builds: 1
-    }
-    builders {
       name: "cmake-roller"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "3600:cores:1|2|4"
@@ -41268,173 +41120,6 @@
       max_concurrent_builds: 1
     }
     builders {
-      name: "rust-roller-dryrun"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "3600:cores:1|2|4"
-      dimensions: "cpu:x64|x86-64"
-      dimensions: "os:Debian"
-      dimensions: "pool:luci.pigweed.roll"
-      exe {
-        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "auto_roller_options": {'
-        '    "add_gitwatcher_ignore": true,'
-        '    "bot_commit": true,'
-        '    "dry_run": true,'
-        '    "force_submit": false,'
-        '    "labels_to_set": null,'
-        '    "labels_to_wait_on": [],'
-        '    "permit_recommended": false,'
-        '    "poll_interval_secs": 90,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "upstream_ref": "main"'
-        '  },'
-        '  "checkout_options": {'
-        '    "branch": "main",'
-        '    "equivalent_remotes": [],'
-        '    "initialize_submodules": false,'
-        '    "match_branch": true,'
-        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
-        '    "use_repo": false,'
-        '    "use_trigger": true'
-        '  },'
-        '  "cipd_packages": ['
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "host",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/host/${platform}",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "host"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    },'
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "aarch64-unknown-linux-gnu",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/target/aarch64-unknown-linux-gnu",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "target",'
-        '        "aarch64-unknown-linux-gnu"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    },'
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "x86_64-unknown-linux-gnu",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/target/x86_64-unknown-linux-gnu",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "target",'
-        '        "x86_64-unknown-linux-gnu"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    },'
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "aarch64-apple-darwin",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/target/aarch64-apple-darwin",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "target",'
-        '        "aarch64-apple-darwin"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    },'
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "x86_64-apple-darwin",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/target/x86_64-apple-darwin",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "target",'
-        '        "x86_64-apple-darwin"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    },'
-        '    {'
-        '      "allow_mismatched_refs": false,'
-        '      "allowed_package_uploaders": ['
-        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
-        '      ],'
-        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
-        '      "name": "thumbv7m-none-eabi",'
-        '      "ref": "latest",'
-        '      "spec": "fuchsia/third_party/rust/target/thumbv7m-none-eabi",'
-        '      "split_names": ['
-        '        "fuchsia",'
-        '        "third_party",'
-        '        "rust",'
-        '        "target",'
-        '        "thumbv7m-none-eabi"'
-        '      ],'
-        '      "tag": "git_revision"'
-        '    }'
-        '  ],'
-        '  "do_not_bisect": true,'
-        '  "do_not_rerun": true,'
-        '  "dry_run": true,'
-        '  "forge_author": true,'
-        '  "header_override": "rust",'
-        '  "recipe": "roller"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 7920
-      caches {
-        name: "builder"
-        path: "builder"
-      }
-      service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-      experimental: YES
-      description_html: "<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-rust-roller-dryrun\">Schedule a new build</a></p>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x\">Trigger a gitiles poll</a></p>\n"
-      shadow_builder_adjustments {
-        service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.pigweed.try"
-        dimensions: "pool:luci.pigweed.try"
-      }
-      max_concurrent_builds: 1
-    }
-    builders {
       name: "sysroot-roller"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "3600:cores:1|2|4"
@@ -41583,6 +41268,420 @@
       max_concurrent_builds: 1
     }
     builders {
+      name: "toolchain-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "3600:cores:1|2|4"
+      dimensions: "cpu:x64|x86-64"
+      dimensions: "os:Debian"
+      dimensions: "pool:luci.pigweed.roll"
+      exe {
+        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "auto_roller_options": {'
+        '    "add_gitwatcher_ignore": true,'
+        '    "bot_commit": true,'
+        '    "dry_run": false,'
+        '    "force_submit": false,'
+        '    "labels_to_set": null,'
+        '    "labels_to_wait_on": [],'
+        '    "permit_recommended": false,'
+        '    "poll_interval_secs": 90,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "upstream_ref": "main"'
+        '  },'
+        '  "checkout_options": {'
+        '    "branch": "main",'
+        '    "equivalent_remotes": [],'
+        '    "initialize_submodules": false,'
+        '    "match_branch": true,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "use_repo": false,'
+        '    "use_trigger": true'
+        '  },'
+        '  "cipd_packages": ['
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "host",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "host"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "aarch64-unknown-linux-gnu",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/aarch64-unknown-linux-gnu",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "aarch64-unknown-linux-gnu"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "x86_64-unknown-linux-gnu",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/x86_64-unknown-linux-gnu",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "x86_64-unknown-linux-gnu"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "aarch64-apple-darwin",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/aarch64-apple-darwin",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "aarch64-apple-darwin"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "x86_64-apple-darwin",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/x86_64-apple-darwin",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "x86_64-apple-darwin"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "thumbv7m-none-eabi",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/thumbv7m-none-eabi",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "thumbv7m-none-eabi"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "clang",'
+        '      "ref": "integration",'
+        '      "spec": "fuchsia/third_party/clang/${platform}",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "clang"'
+        '      ],'
+        '      "tag": "git_revision"'
+        '    }'
+        '  ],'
+        '  "cipd_variables": ['
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": [],'
+        '      "comment_prefix": null,'
+        '      "name": "RUST_VERSION",'
+        '      "path": "MODULE.bazel",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": [],'
+        '      "comment_prefix": null,'
+        '      "name": "LLVM_VERSION",'
+        '      "path": "MODULE.bazel",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/clang/${platform}",'
+        '      "tag": "git_revision"'
+        '    }'
+        '  ],'
+        '  "do_not_bisect": false,'
+        '  "do_not_rerun": false,'
+        '  "dry_run": false,'
+        '  "forge_author": true,'
+        '  "header_override": "toolchain",'
+        '  "module_bazel_lock_entries": ['
+        '    {}'
+        '  ],'
+        '  "recipe": "roller"'
+        '}'
+      priority: 40
+      execution_timeout_secs: 7920
+      caches {
+        name: "builder"
+        path: "builder"
+      }
+      service_account: "pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com"
+      description_html: "Corresponding builders in other buckets:<ul>\n<li>tools.roll / toolchain-roller</li>\n<li><a href=\"https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller-dryrun\">tools.roll / toolchain-roller-dryrun</a></li>\n</ul>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller\">Schedule a new build</a></p>\n"
+      shadow_builder_adjustments {
+        service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
+        pool: "luci.pigweed.try"
+        dimensions: "pool:luci.pigweed.try"
+      }
+      max_concurrent_builds: 1
+    }
+    builders {
+      name: "toolchain-roller-dryrun"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "3600:cores:1|2|4"
+      dimensions: "cpu:x64|x86-64"
+      dimensions: "os:Debian"
+      dimensions: "pool:luci.pigweed.roll"
+      exe {
+        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "auto_roller_options": {'
+        '    "add_gitwatcher_ignore": true,'
+        '    "bot_commit": true,'
+        '    "dry_run": true,'
+        '    "force_submit": false,'
+        '    "labels_to_set": null,'
+        '    "labels_to_wait_on": [],'
+        '    "permit_recommended": false,'
+        '    "poll_interval_secs": 90,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "upstream_ref": "main"'
+        '  },'
+        '  "checkout_options": {'
+        '    "branch": "main",'
+        '    "equivalent_remotes": [],'
+        '    "initialize_submodules": false,'
+        '    "match_branch": true,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "use_repo": false,'
+        '    "use_trigger": true'
+        '  },'
+        '  "cipd_packages": ['
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "host",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "host"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "aarch64-unknown-linux-gnu",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/aarch64-unknown-linux-gnu",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "aarch64-unknown-linux-gnu"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "x86_64-unknown-linux-gnu",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/x86_64-unknown-linux-gnu",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "x86_64-unknown-linux-gnu"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "aarch64-apple-darwin",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/aarch64-apple-darwin",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "aarch64-apple-darwin"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "x86_64-apple-darwin",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/x86_64-apple-darwin",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "x86_64-apple-darwin"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "rust-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "thumbv7m-none-eabi",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/target/thumbv7m-none-eabi",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "rust",'
+        '        "target",'
+        '        "thumbv7m-none-eabi"'
+        '      ],'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": ['
+        '        "clang-prod-builder@fuchsia-service-accounts.iam.gserviceaccount.com"'
+        '      ],'
+        '      "json_path": "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",'
+        '      "name": "clang",'
+        '      "ref": "integration",'
+        '      "spec": "fuchsia/third_party/clang/${platform}",'
+        '      "split_names": ['
+        '        "fuchsia",'
+        '        "third_party",'
+        '        "clang"'
+        '      ],'
+        '      "tag": "git_revision"'
+        '    }'
+        '  ],'
+        '  "cipd_variables": ['
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": [],'
+        '      "comment_prefix": null,'
+        '      "name": "RUST_VERSION",'
+        '      "path": "MODULE.bazel",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/rust/host/${platform}",'
+        '      "tag": "git_revisions"'
+        '    },'
+        '    {'
+        '      "allow_mismatched_refs": false,'
+        '      "allowed_package_uploaders": [],'
+        '      "comment_prefix": null,'
+        '      "name": "LLVM_VERSION",'
+        '      "path": "MODULE.bazel",'
+        '      "ref": "latest",'
+        '      "spec": "fuchsia/third_party/clang/${platform}",'
+        '      "tag": "git_revision"'
+        '    }'
+        '  ],'
+        '  "do_not_bisect": true,'
+        '  "do_not_rerun": true,'
+        '  "dry_run": true,'
+        '  "forge_author": true,'
+        '  "header_override": "toolchain",'
+        '  "module_bazel_lock_entries": ['
+        '    {}'
+        '  ],'
+        '  "recipe": "roller"'
+        '}'
+      priority: 40
+      execution_timeout_secs: 7920
+      caches {
+        name: "builder"
+        path: "builder"
+      }
+      service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
+      description_html: "Corresponding builders in other buckets:<ul>\n<li><a href=\"https://ci.chromium.org/p/pigweed/builders/tools.roll/toolchain-roller\">tools.roll / toolchain-roller</a></li>\n<li>tools.roll / toolchain-roller-dryrun</li>\n</ul>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/tools.roll-toolchain-roller-dryrun\">Schedule a new build</a></p>\n<p><a href=\"https://luci-scheduler.appspot.com/jobs/pigweed/toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x\">Trigger a gitiles poll</a></p>\n"
+      shadow_builder_adjustments {
+        service_account: "pigweed-try-builder@pigweed-service-accounts.iam.gserviceaccount.com"
+        pool: "luci.pigweed.try"
+        dimensions: "pool:luci.pigweed.try"
+      }
+      max_concurrent_builds: 1
+    }
+    builders {
       name: "zephyr-roller"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "3600:cores:1|2|4"
diff --git a/generated/pigweed/luci/luci-notify.cfg b/generated/pigweed/luci/luci-notify.cfg
index 4869469..e6f1a4e 100644
--- a/generated/pigweed/luci/luci-notify.cfg
+++ b/generated/pigweed/luci/luci-notify.cfg
@@ -4882,51 +4882,6 @@
   }
   builders {
     bucket: "tools.roll"
-    name: "clang-roller"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "pigweed-build-notify@google.com"
-    }
-    template: "roller"
-  }
-  notifications {
-    on_occurrence: INFRA_FAILURE
-    email {
-      recipients: "pigweed-build-notify@google.com"
-      recipients: "pigweed-infra-failures@google.com"
-    }
-    template: "roller"
-  }
-  builders {
-    bucket: "tools.roll"
-    name: "clang-roller-dryrun"
-    repository: "https://pigweed.googlesource.com/pigweed/pigweed"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "pigweed-build-notify@google.com"
-    }
-    template: "roller"
-  }
-  notifications {
-    on_occurrence: INFRA_FAILURE
-    email {
-      recipients: "pigweed-build-notify@google.com"
-      recipients: "pigweed-infra-failures@google.com"
-    }
-    template: "roller"
-  }
-  builders {
-    bucket: "tools.roll"
     name: "cmake-roller"
     repository: "https://pigweed.googlesource.com/pigweed/pigweed"
   }
@@ -5510,6 +5465,51 @@
   }
   builders {
     bucket: "tools.roll"
+    name: "toolchain-roller"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_new_status: SUCCESS
+    email {
+      recipients: "pigweed-build-notify@google.com"
+    }
+    template: "roller"
+  }
+  notifications {
+    on_occurrence: INFRA_FAILURE
+    email {
+      recipients: "pigweed-build-notify@google.com"
+      recipients: "pigweed-infra-failures@google.com"
+    }
+    template: "roller"
+  }
+  builders {
+    bucket: "tools.roll"
+    name: "toolchain-roller-dryrun"
+    repository: "https://pigweed.googlesource.com/pigweed/pigweed"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_new_status: SUCCESS
+    email {
+      recipients: "pigweed-build-notify@google.com"
+    }
+    template: "roller"
+  }
+  notifications {
+    on_occurrence: INFRA_FAILURE
+    email {
+      recipients: "pigweed-build-notify@google.com"
+      recipients: "pigweed-infra-failures@google.com"
+    }
+    template: "roller"
+  }
+  builders {
+    bucket: "tools.roll"
     name: "zephyr-roller"
     repository: "https://pigweed.googlesource.com/pigweed/pigweed"
   }
diff --git a/generated/pigweed/luci/luci-scheduler.cfg b/generated/pigweed/luci/luci-scheduler.cfg
index 3321d3c..92a7869 100644
--- a/generated/pigweed/luci/luci-scheduler.cfg
+++ b/generated/pigweed/luci/luci-scheduler.cfg
@@ -177,25 +177,6 @@
   }
 }
 job {
-  id: "tools.roll-clang-roller"
-  realm: "tools.roll"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "tools.roll"
-    builder: "clang-roller"
-  }
-}
-job {
-  id: "tools.roll-clang-roller-dryrun"
-  realm: "tools.roll"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "tools.roll"
-    builder: "clang-roller-dryrun"
-  }
-}
-job {
   id: "tools.roll-cmake-roller"
   realm: "tools.roll"
   buildbucket {
@@ -3294,15 +3275,6 @@
   }
 }
 job {
-  id: "tools.roll-rust-roller-dryrun"
-  realm: "tools.roll"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "tools.roll"
-    builder: "rust-roller-dryrun"
-  }
-}
-job {
   id: "showcase.ci-showcase-sense-linux-bazel"
   realm: "showcase.ci"
   buildbucket {
@@ -3446,6 +3418,25 @@
   }
 }
 job {
+  id: "tools.roll-toolchain-roller"
+  realm: "tools.roll"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "tools.roll"
+    builder: "toolchain-roller"
+  }
+}
+job {
+  id: "tools.roll-toolchain-roller-dryrun"
+  realm: "tools.roll"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "tools.roll"
+    builder: "toolchain-roller-dryrun"
+  }
+}
+job {
   id: "tools.roll-zephyr-roller"
   realm: "tools.roll"
   buildbucket {
@@ -3714,17 +3705,6 @@
   }
 }
 trigger {
-  id: "clang-roller-dryrun-tools-roll-pw-main-0-53-11-x-x-0-x"
-  realm: "tools.roll"
-  schedule: "0 53 11 * * 0 *"
-  triggers: "tools.roll-clang-roller-dryrun"
-  gitiles {
-    repo: "https://pigweed.googlesource.com/pigweed/pigweed"
-    refs: "regexp:refs/heads/main"
-    path_regexps: ".*"
-  }
-}
-trigger {
   id: "cmake-roller-tools-roll-pw-main-0-22-18-x-x-6-x"
   realm: "tools.roll"
   schedule: "0 22 18 * * 6 *"
@@ -6503,17 +6483,6 @@
   }
 }
 trigger {
-  id: "rust-roller-dryrun-tools-roll-pw-main-0-43-14-x-x-0-x"
-  realm: "tools.roll"
-  schedule: "0 43 14 * * 0 *"
-  triggers: "tools.roll-rust-roller-dryrun"
-  gitiles {
-    repo: "https://pigweed.googlesource.com/pigweed/pigweed"
-    refs: "regexp:refs/heads/main"
-    path_regexps: ".*"
-  }
-}
-trigger {
   id: "sc-sense-linux-bazel-ci-pw-main"
   realm: "showcase.ci"
   triggers: "showcase.ci-showcase-sense-linux-bazel"
@@ -6579,6 +6548,17 @@
   }
 }
 trigger {
+  id: "toolchain-roller-dryrun-tools-roll-pw-main-0-55-19-x-x-0-x"
+  realm: "tools.roll"
+  schedule: "0 55 19 * * 0 *"
+  triggers: "tools.roll-toolchain-roller-dryrun"
+  gitiles {
+    repo: "https://pigweed.googlesource.com/pigweed/pigweed"
+    refs: "regexp:refs/heads/main"
+    path_regexps: ".*"
+  }
+}
+trigger {
   id: "zephyr-examples-hello-dts-ci-pw-bazel-main"
   realm: "zephyr.ci"
   triggers: "zephyr.ci-zephyr-examples-hello-dts"