[roll] Non-trivial recipe roll

Change-Id: I4346a56f795edda8d06fd6f041d9af77b5811d02
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/149302
Reviewed-by: William Hesse <whesse@google.com>
diff --git a/README.recipes.md b/README.recipes.md
index b2e0319..5c27be0 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -186,29 +186,29 @@
 
 &mdash; **def [RunSteps](/recipe_modules/dart/examples/example-get_secret.py#12)(api):**
 
-[build/recipe_modules/goma]: https://chromium.googlesource.com/chromium/tools/build.git/+/3ea60ddfa686c9987d0d687a9bb1aeecb378d373/scripts/slave/README.recipes.md#recipe_modules-goma
-[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-bot_update
-[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-depot_tools
-[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-gclient
-[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-git
-[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-gitiles
-[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-gsutil
-[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-osx_sdk
-[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/9b4a0570e51dd3ba8d419518b1a5537da40bb893/recipes/README.recipes.md#recipe_modules-tryserver
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-isolated
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-service_account
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-swarming
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a24b238dfe4332ff9e6a55285a1068625418d059/recipe_engine/recipe_api.py#871
+[build/recipe_modules/goma]: https://chromium.googlesource.com/chromium/tools/build.git/+/da8676450acb99358d862bf7ea1b829381846fa0/scripts/slave/README.recipes.md#recipe_modules-goma
+[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-bot_update
+[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-depot_tools
+[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-gclient
+[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-git
+[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-gitiles
+[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-gsutil
+[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-osx_sdk
+[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/beb877fe49423aafd5c382916937f5445395ca10/recipes/README.recipes.md#recipe_modules-tryserver
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-isolated
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-service_account
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-swarming
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/093ad4d4c27bcecdb3b80d36b4615692cde14524/recipe_engine/recipe_api.py#871
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 18f2c56..a1d0539 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -16,22 +16,22 @@
   "deps": {
     "build": {
       "branch": "refs/heads/master",
-      "revision": "3ea60ddfa686c9987d0d687a9bb1aeecb378d373",
+      "revision": "da8676450acb99358d862bf7ea1b829381846fa0",
       "url": "https://chromium.googlesource.com/chromium/tools/build.git"
     },
     "depot_tools": {
       "branch": "refs/heads/master",
-      "revision": "9b4a0570e51dd3ba8d419518b1a5537da40bb893",
+      "revision": "beb877fe49423aafd5c382916937f5445395ca10",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/master",
-      "revision": "29f831f90f18d747a5cab7e83bbb32be65462a1d",
+      "revision": "1f80d7f1018fc3edcd7f86bf0b3b53c32eb1127a",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/master",
-      "revision": "a24b238dfe4332ff9e6a55285a1068625418d059",
+      "revision": "093ad4d4c27bcecdb3b80d36b4615692cde14524",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
index 0654e6e..7a67436 100644
--- a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
+++ b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
@@ -375,7 +375,7 @@
       "--buildbot-buildername",
       "analyzer-linux-release",
       "--buildbot-slavename",
-      "trusty-dart-123"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -1106,7 +1106,7 @@
       "--buildbot-buildername",
       "analyzer-linux-release",
       "--buildbot-slavename",
-      "trusty-dart-123"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -1240,7 +1240,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -1263,7 +1263,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/basic-failure.json b/recipe_modules/dart/examples/example.expected/basic-failure.json
index cfcf491..6b41a62 100644
--- a/recipe_modules/dart/examples/example.expected/basic-failure.json
+++ b/recipe_modules/dart/examples/example.expected/basic-failure.json
@@ -376,7 +376,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"build-fail\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "build-fail"
+      "build-fail",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/basic-mac.json b/recipe_modules/dart/examples/example.expected/basic-mac.json
index ac26d44..a716e3d 100644
--- a/recipe_modules/dart/examples/example.expected/basic-mac.json
+++ b/recipe_modules/dart/examples/example.expected/basic-mac.json
@@ -387,7 +387,7 @@
       "--buildbot-buildername",
       "dart2js-strong-mac-x64-chrome-dev",
       "--buildbot-slavename",
-      "mac-dart-123"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/basic-missing-name.json b/recipe_modules/dart/examples/example.expected/basic-missing-name.json
index 8195920..b536613 100644
--- a/recipe_modules/dart/examples/example.expected/basic-missing-name.json
+++ b/recipe_modules/dart/examples/example.expected/basic-missing-name.json
@@ -373,7 +373,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"this-name-does-not-exist-in-test-matrix\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "this-name-does-not-exist-in-test-matrix"
+      "this-name-does-not-exist-in-test-matrix",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/basic-timeout.json b/recipe_modules/dart/examples/example.expected/basic-timeout.json
index 18eaaaf..9d1766c 100644
--- a/recipe_modules/dart/examples/example.expected/basic-timeout.json
+++ b/recipe_modules/dart/examples/example.expected/basic-timeout.json
@@ -374,7 +374,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"times-out\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "times-out"
+      "times-out",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/basic.json b/recipe_modules/dart/examples/example.expected/basic.json
index ca72605..d152f28 100644
--- a/recipe_modules/dart/examples/example.expected/basic.json
+++ b/recipe_modules/dart/examples/example.expected/basic.json
@@ -419,7 +419,9 @@
       "{\"bucket\": \"try\", \"builder\": \"dart2js-strong-linux-x64-firefox-try\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "dart2js-strong-linux-x64-firefox-try"
+      "dart2js-strong-linux-x64-firefox-try",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -966,7 +968,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -989,7 +991,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/co19.json b/recipe_modules/dart/examples/example.expected/co19.json
index ba97ce0..a3db4a8 100644
--- a/recipe_modules/dart/examples/example.expected/co19.json
+++ b/recipe_modules/dart/examples/example.expected/co19.json
@@ -50,7 +50,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -73,7 +73,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/co19_2-legacy.json b/recipe_modules/dart/examples/example.expected/co19_2-legacy.json
index 9e13e0a..e6efe50 100644
--- a/recipe_modules/dart/examples/example.expected/co19_2-legacy.json
+++ b/recipe_modules/dart/examples/example.expected/co19_2-legacy.json
@@ -46,7 +46,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -69,7 +69,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/example-android.json b/recipe_modules/dart/examples/example.expected/example-android.json
index d588b97..1c2110c 100644
--- a/recipe_modules/dart/examples/example.expected/example-android.json
+++ b/recipe_modules/dart/examples/example.expected/example-android.json
@@ -373,7 +373,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"vm-kernel-precomp-android-release-armsimdbc64\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "vm-kernel-precomp-android-release-armsimdbc64"
+      "vm-kernel-precomp-android-release-armsimdbc64",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -876,7 +878,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -899,7 +901,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/example-mac.json b/recipe_modules/dart/examples/example.expected/example-mac.json
index 06971b8..c66adc0 100644
--- a/recipe_modules/dart/examples/example.expected/example-mac.json
+++ b/recipe_modules/dart/examples/example.expected/example-mac.json
@@ -373,7 +373,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"vm-kernel-mac-release-x64\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "vm-kernel-mac-release-x64"
+      "vm-kernel-mac-release-x64",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -1102,7 +1104,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"vm-kernel-mac-release-x64\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "vm-kernel-mac-release-x64"
+      "vm-kernel-mac-release-x64",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/fuzz-test.json b/recipe_modules/dart/examples/example.expected/fuzz-test.json
index 3d27cc1..a6dbcc7 100644
--- a/recipe_modules/dart/examples/example.expected/fuzz-test.json
+++ b/recipe_modules/dart/examples/example.expected/fuzz-test.json
@@ -373,7 +373,9 @@
       "{\"bucket\": \"ci\", \"builder\": \"fuzz-linux\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "fuzz-linux"
+      "fuzz-linux",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
@@ -876,7 +878,7 @@
       "-root",
       "[CACHE]/swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -899,7 +901,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/dart/examples/example.expected/vm-win.json b/recipe_modules/dart/examples/example.expected/vm-win.json
index be43258..657bdf5 100644
--- a/recipe_modules/dart/examples/example.expected/vm-win.json
+++ b/recipe_modules/dart/examples/example.expected/vm-win.json
@@ -375,7 +375,7 @@
       "--buildbot-buildername",
       "vm-kernel-win-release-simarm_x64",
       "--buildbot-slavename",
-      "win-dart-123"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
@@ -1141,7 +1141,7 @@
       "--buildbot-buildername",
       "vm-kernel-win-release-simarm_x64",
       "--buildbot-slavename",
-      "win-dart-123"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
@@ -1277,7 +1277,7 @@
       "-root",
       "[CACHE]\\swarming_client",
       "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:04f55b620457d37b0fb764c195eb2b6d18c3501f",
+      "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
       "0",
       "-json-output",
@@ -1301,7 +1301,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:04f\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
index a3b23e2..fbc75e4 100644
--- a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
+++ b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
@@ -422,7 +422,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -696,7 +696,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -987,7 +987,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1261,7 +1261,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1552,7 +1552,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1849,7 +1849,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2254,7 +2254,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2537,7 +2537,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2840,7 +2840,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3143,7 +3143,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3446,7 +3446,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3749,7 +3749,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4052,7 +4052,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4355,7 +4355,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4658,7 +4658,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4961,7 +4961,7 @@
       "--buildbot-buildername",
       "flutter-engine-linux",
       "--buildbot-slavename",
-      "fake-m1"
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
index 7e99b70..3cb3e78 100644
--- a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
+++ b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
@@ -701,7 +701,9 @@
       "{\"bucket\": \"try\", \"builder\": \"dart2js-win-debug-x64-firefox-try\", \"project\": \"dart\"}",
       "--is-luci",
       "--buildbot-buildername",
-      "dart2js-win-debug-x64-firefox-try"
+      "dart2js-win-debug-x64-firefox-try",
+      "--buildbot-slavename",
+      "fake-bot-id"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {