[macos_sdk] Add timeout

Add a timeout to the Mac SDK so builds like
http://ci.chromium.org/b/8748931725163952225 will fail faster. (That Mac
was bad and has since been reimaged.)

Bug: b/338646686
Change-Id: I90c29a33b5c1eac143a0a2953a0ae8abaa4f8076
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1041517
Fuchsia-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/recipe_modules/build/tests/full.expected/mac__release_version.json b/recipe_modules/build/tests/full.expected/mac__release_version.json
index c591d39..645551f 100644
--- a/recipe_modules/build/tests/full.expected/mac__release_version.json
+++ b/recipe_modules/build/tests/full.expected/mac__release_version.json
@@ -61,6 +61,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -92,6 +96,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -132,6 +140,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -157,6 +169,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -182,6 +198,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -2078,7 +2098,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-engprod-metrics-prod.metrics.rbe_client_metrics_raw",
-      "{\"build_id\": \"8945511751514863184\", \"builder_name\": \"builder\", \"created_at\": \"2012-05-14T12:53:21.500Z\", \"instance\": \"fake_rbe_instance\", \"stats\": \"{\\\"environment\\\": {\\\"bar\\\": \\\"42\\\", \\\"foo\\\": \\\"false\\\"}}\"}"
+      "{\"build_id\": \"8945511751514863184\", \"builder_name\": \"builder\", \"created_at\": \"2012-05-14T12:53:23Z\", \"instance\": \"fake_rbe_instance\", \"stats\": \"{\\\"environment\\\": {\\\"bar\\\": \\\"42\\\", \\\"foo\\\": \\\"false\\\"}}\"}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2413,8 +2433,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2424,7 +2444,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2722,7 +2742,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:26.000000Z",
+      "Custom-Time:2012-05-14T12:53:27.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -2791,7 +2811,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:27.500000Z",
+      "Custom-Time:2012-05-14T12:53:29.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -2823,7 +2843,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:29.000000Z",
+      "Custom-Time:2012-05-14T12:53:30.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3657,7 +3677,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:30.500000Z",
+      "Custom-Time:2012-05-14T12:53:32.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipe_modules/macos_sdk/__init__.py b/recipe_modules/macos_sdk/__init__.py
index 6cdd9d0..4295cb5 100644
--- a/recipe_modules/macos_sdk/__init__.py
+++ b/recipe_modules/macos_sdk/__init__.py
@@ -13,6 +13,7 @@
     "recipe_engine/raw_io",
     "recipe_engine/runtime",
     "recipe_engine/step",
+    "recipe_engine/time",
     "recipe_engine/version",
 ]
 
diff --git a/recipe_modules/macos_sdk/api.py b/recipe_modules/macos_sdk/api.py
index a338814..96331ba 100644
--- a/recipe_modules/macos_sdk/api.py
+++ b/recipe_modules/macos_sdk/api.py
@@ -7,7 +7,8 @@
 Available only to Google-run bots.
 """
 
-from contextlib import contextmanager
+import contextlib
+import datetime
 
 from recipe_engine import recipe_api
 
@@ -53,7 +54,7 @@
         assert self._sysroot
         return self._sysroot
 
-    @contextmanager
+    @contextlib.contextmanager
     def __call__(self, kind="mac", additional_sdks=None):
         """Sets up the XCode SDK environment.
 
@@ -118,10 +119,15 @@
                     f"Unable to find an XCode version for {current_os}."
                 )
         self._sdk_version = self._sdk_version.lower()
+
         try:
-            with self.m.context(infra_steps=True), self.m.step.nest(
-                f"ensure XCode {self._sdk_version}"
-            ):
+            with contextlib.ExitStack() as stack:
+                stack.enter_context(self.m.context(infra_steps=True))
+                stack.enter_context(
+                    self.m.step.nest(f"ensure XCode {self._sdk_version}")
+                )
+                stack.enter_context(self.m.time.timeout(datetime.timedelta(minutes=20)))
+
                 cache_dir = self.m.path.cache_dir / "macos_sdk"
                 if not self._mac_toolchain:
                     self._mac_toolchain = self.m.cipd.ensure_tool(
diff --git a/recipe_modules/macos_sdk/tests/full.expected/mac.json b/recipe_modules/macos_sdk/tests/full.expected/mac.json
index e378208..2a15c6f 100644
--- a/recipe_modules/macos_sdk/tests/full.expected/mac.json
+++ b/recipe_modules/macos_sdk/tests/full.expected/mac.json
@@ -30,6 +30,12 @@
       "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/be1bf3cbb34d603837500595770868faf18232f9529e0a375b9527506d4cd711"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -49,6 +55,12 @@
       "/path/to/tmp/json"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
@@ -77,6 +89,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -94,6 +112,12 @@
       "[CACHE]/macos_sdk/xcode_version/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install XCode xcode_version",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -111,6 +135,12 @@
       "[CACHE]/macos_sdk/XCode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/sdk_version"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install sdk_version",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -124,6 +154,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.select XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -137,6 +173,12 @@
       "--show-sdk-path"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.xcrun",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/contrib/binutils.expected/mac_intel.json b/recipes/contrib/binutils.expected/mac_intel.json
index f4ac45a..f9b1738 100644
--- a/recipes/contrib/binutils.expected/mac_intel.json
+++ b/recipes/contrib/binutils.expected/mac_intel.json
@@ -840,6 +840,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -871,6 +875,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -911,6 +919,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -936,6 +948,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -961,6 +977,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
diff --git a/recipes/contrib/bloaty.expected/mac_try.json b/recipes/contrib/bloaty.expected/mac_try.json
index 56204b2..5f7ae23 100644
--- a/recipes/contrib/bloaty.expected/mac_try.json
+++ b/recipes/contrib/bloaty.expected/mac_try.json
@@ -1887,6 +1887,10 @@
     },
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:try"
       },
@@ -1922,6 +1926,10 @@
     },
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:try"
       },
@@ -1966,6 +1974,10 @@
     },
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:try"
       },
@@ -1995,6 +2007,10 @@
     },
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:try"
       },
@@ -2024,6 +2040,10 @@
     },
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:try"
       },
@@ -2644,8 +2664,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2791,7 +2811,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/cargo_build.expected/prod.json b/recipes/contrib/cargo_build.expected/prod.json
index a7f52cf..9521409 100644
--- a/recipes/contrib/cargo_build.expected/prod.json
+++ b/recipes/contrib/cargo_build.expected/prod.json
@@ -491,6 +491,12 @@
       "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/be1bf3cbb34d603837500595770868faf18232f9529e0a375b9527506d4cd711"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "build.ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
@@ -510,6 +516,12 @@
       "/path/to/tmp/json"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "build.ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
@@ -538,6 +550,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "build.ensure XCode 14e222b.install XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -551,6 +569,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "build.ensure XCode 14e222b.select XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -564,6 +588,12 @@
       "--show-sdk-path"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "build.ensure XCode 14e222b.xcrun",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
diff --git a/recipes/contrib/clang_toolchain.expected/ci_mac_x64.json b/recipes/contrib/clang_toolchain.expected/ci_mac_x64.json
index 6a843da..b4dda43 100644
--- a/recipes/contrib/clang_toolchain.expected/ci_mac_x64.json
+++ b/recipes/contrib/clang_toolchain.expected/ci_mac_x64.json
@@ -979,6 +979,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1010,6 +1014,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1050,6 +1058,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1075,6 +1087,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1100,6 +1116,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -13476,7 +13496,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:21.500000Z",
+      "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -13519,7 +13539,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:23.000000Z",
+      "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -14151,7 +14171,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -14193,7 +14213,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000004500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
@@ -14522,8 +14542,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:26\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000007500@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:27.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000009000@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -14669,7 +14689,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:26\", \"time_stamp_int\": 1337000007500}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/clang_toolchain.expected/lld.json b/recipes/contrib/clang_toolchain.expected/lld.json
index 437ab6e..0dfc67f 100644
--- a/recipes/contrib/clang_toolchain.expected/lld.json
+++ b/recipes/contrib/clang_toolchain.expected/lld.json
@@ -957,6 +957,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -988,6 +992,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1028,6 +1036,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1053,6 +1065,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1078,6 +1094,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -13446,7 +13466,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:21.500000Z",
+      "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -13489,7 +13509,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:23.000000Z",
+      "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -14121,7 +14141,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -14163,7 +14183,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000004500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
@@ -14492,8 +14512,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:26\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000007500@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:27.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000009000@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -14639,7 +14659,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:26\", \"time_stamp_int\": 1337000007500}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/clang_toolchain.expected/mac_arm64.json b/recipes/contrib/clang_toolchain.expected/mac_arm64.json
index 095ed14..d1e0435 100644
--- a/recipes/contrib/clang_toolchain.expected/mac_arm64.json
+++ b/recipes/contrib/clang_toolchain.expected/mac_arm64.json
@@ -947,6 +947,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -978,6 +982,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1018,6 +1026,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1043,6 +1055,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1068,6 +1084,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -10365,7 +10385,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:21.500000Z",
+      "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -10408,7 +10428,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:23.000000Z",
+      "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -11022,8 +11042,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:26\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000007500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -11169,7 +11189,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:26\", \"time_stamp_int\": 1337000007500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/clang_toolchain.expected/prod_mac_x64.json b/recipes/contrib/clang_toolchain.expected/prod_mac_x64.json
index 913d551..1a315f2 100644
--- a/recipes/contrib/clang_toolchain.expected/prod_mac_x64.json
+++ b/recipes/contrib/clang_toolchain.expected/prod_mac_x64.json
@@ -957,6 +957,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -988,6 +992,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1028,6 +1036,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1053,6 +1065,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1078,6 +1094,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -13456,7 +13476,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:21.500000Z",
+      "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -13499,7 +13519,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:23.000000Z",
+      "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -14280,7 +14300,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"clang_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}, \"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"project\": \"integration\"}}, \"clang_toolchain\": {\"git_repository\": \"https://llvm.googlesource.com/llvm-project\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/llvm.googlesource.com/llvm-project/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -14322,7 +14342,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000004500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
@@ -14801,8 +14821,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:26\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000007500@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:27.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000009000@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -14948,7 +14968,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:26\", \"time_stamp_int\": 1337000007500}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/cmake.expected/cross.json b/recipes/contrib/cmake.expected/cross.json
index b48d0ea..db1fd35 100644
--- a/recipes/contrib/cmake.expected/cross.json
+++ b/recipes/contrib/cmake.expected/cross.json
@@ -89,6 +89,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -120,6 +124,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -160,6 +168,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -185,6 +197,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -210,6 +226,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/cmake.expected/mac.json b/recipes/contrib/cmake.expected/mac.json
index a7a3eab..8176e50 100644
--- a/recipes/contrib/cmake.expected/mac.json
+++ b/recipes/contrib/cmake.expected/mac.json
@@ -89,6 +89,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -120,6 +124,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -160,6 +168,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -185,6 +197,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -210,6 +226,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/dart_toolchain.expected/mac-arm64.json b/recipes/contrib/dart_toolchain.expected/mac-arm64.json
index dabd63c..66e205d 100644
--- a/recipes/contrib/dart_toolchain.expected/mac-arm64.json
+++ b/recipes/contrib/dart_toolchain.expected/mac-arm64.json
@@ -1294,6 +1294,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1325,6 +1329,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1365,6 +1373,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1390,6 +1402,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1415,6 +1431,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -2211,8 +2231,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2358,7 +2378,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/dart_toolchain.expected/mac-x64.json b/recipes/contrib/dart_toolchain.expected/mac-x64.json
index 1e102d5..e6ab843 100644
--- a/recipes/contrib/dart_toolchain.expected/mac-x64.json
+++ b/recipes/contrib/dart_toolchain.expected/mac-x64.json
@@ -1294,6 +1294,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1325,6 +1329,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1365,6 +1373,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1390,6 +1402,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -1415,6 +1431,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -2211,8 +2231,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2358,7 +2378,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/fastboot.expected/mac.json b/recipes/contrib/fastboot.expected/mac.json
index 2bdbd90..ed29b88 100644
--- a/recipes/contrib/fastboot.expected/mac.json
+++ b/recipes/contrib/fastboot.expected/mac.json
@@ -8850,6 +8850,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "android:try"
       },
@@ -8881,6 +8885,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "android:try"
       },
@@ -8921,6 +8929,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "android:try"
       },
@@ -8946,6 +8958,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "android:try"
       },
@@ -8971,6 +8987,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "android:try"
       },
diff --git a/recipes/contrib/gcc_toolchain.expected/mac_intel.json b/recipes/contrib/gcc_toolchain.expected/mac_intel.json
index 4d266cf..5905631 100644
--- a/recipes/contrib/gcc_toolchain.expected/mac_intel.json
+++ b/recipes/contrib/gcc_toolchain.expected/mac_intel.json
@@ -1837,6 +1837,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1868,6 +1872,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1908,6 +1916,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1933,6 +1945,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1958,6 +1974,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
diff --git a/recipes/contrib/gnu_build_tools.expected/prod.json b/recipes/contrib/gnu_build_tools.expected/prod.json
index cab6141..3b20e03 100644
--- a/recipes/contrib/gnu_build_tools.expected/prod.json
+++ b/recipes/contrib/gnu_build_tools.expected/prod.json
@@ -89,6 +89,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -120,6 +124,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -160,6 +168,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -185,6 +197,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -210,6 +226,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/goma_client.expected/mac_x64.json b/recipes/contrib/goma_client.expected/mac_x64.json
index b0d7281..c04e425 100644
--- a/recipes/contrib/goma_client.expected/mac_x64.json
+++ b/recipes/contrib/goma_client.expected/mac_x64.json
@@ -1001,6 +1001,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1032,6 +1036,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1072,6 +1080,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1097,6 +1109,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1122,6 +1138,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
diff --git a/recipes/contrib/jq.expected/mac.json b/recipes/contrib/jq.expected/mac.json
index 0dd6ff5..0afef75 100644
--- a/recipes/contrib/jq.expected/mac.json
+++ b/recipes/contrib/jq.expected/mac.json
@@ -480,6 +480,12 @@
       "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/be1bf3cbb34d603837500595770868faf18232f9529e0a375b9527506d4cd711"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -499,6 +505,12 @@
       "/path/to/tmp/json"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
@@ -527,6 +539,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -540,6 +558,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.select XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -553,6 +577,12 @@
       "--show-sdk-path"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.xcrun",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/contrib/llvm.expected/mac_amd64.json b/recipes/contrib/llvm.expected/mac_amd64.json
index 17fb0b5..ab1a1be 100644
--- a/recipes/contrib/llvm.expected/mac_amd64.json
+++ b/recipes/contrib/llvm.expected/mac_amd64.json
@@ -786,6 +786,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -817,6 +821,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -857,6 +865,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -882,6 +894,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -907,6 +923,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -3477,8 +3497,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -3624,7 +3644,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/llvm.expected/mac_arm64.json b/recipes/contrib/llvm.expected/mac_arm64.json
index 0c4ff56..7e7202a 100644
--- a/recipes/contrib/llvm.expected/mac_arm64.json
+++ b/recipes/contrib/llvm.expected/mac_arm64.json
@@ -786,6 +786,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -817,6 +821,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -857,6 +865,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -882,6 +894,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -907,6 +923,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "project:ci"
       },
@@ -3473,8 +3493,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -3620,7 +3640,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
diff --git a/recipes/contrib/ninja.expected/mac-arm64.json b/recipes/contrib/ninja.expected/mac-arm64.json
index 9c173a2..8d0c065 100644
--- a/recipes/contrib/ninja.expected/mac-arm64.json
+++ b/recipes/contrib/ninja.expected/mac-arm64.json
@@ -1497,6 +1497,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1528,6 +1532,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1568,6 +1576,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1593,6 +1605,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1618,6 +1634,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2726,6 +2746,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001203.0
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2751,6 +2775,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001203.0
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2994,6 +3022,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001204.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -3019,6 +3051,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001204.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/ninja.expected/mac.json b/recipes/contrib/ninja.expected/mac.json
index 0509d9f..78cd27a 100644
--- a/recipes/contrib/ninja.expected/mac.json
+++ b/recipes/contrib/ninja.expected/mac.json
@@ -1497,6 +1497,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1528,6 +1532,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1568,6 +1576,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1593,6 +1605,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -1618,6 +1634,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2722,6 +2742,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001203.0
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2747,6 +2771,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001203.0
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -2990,6 +3018,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001204.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -3015,6 +3047,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001204.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/yasm.expected/cross.json b/recipes/contrib/yasm.expected/cross.json
index 7d659a3..971c578 100644
--- a/recipes/contrib/yasm.expected/cross.json
+++ b/recipes/contrib/yasm.expected/cross.json
@@ -759,6 +759,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -790,6 +794,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -830,6 +838,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -855,6 +867,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -880,6 +896,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/contrib/yasm.expected/mac.json b/recipes/contrib/yasm.expected/mac.json
index a899448..1295421 100644
--- a/recipes/contrib/yasm.expected/mac.json
+++ b/recipes/contrib/yasm.expected/mac.json
@@ -759,6 +759,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -790,6 +794,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -830,6 +838,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -855,6 +867,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
@@ -880,6 +896,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:prod"
       },
diff --git a/recipes/qemu.expected/mac-amd64.json b/recipes/qemu.expected/mac-amd64.json
index 951b5c6..a0c9d20 100644
--- a/recipes/qemu.expected/mac-amd64.json
+++ b/recipes/qemu.expected/mac-amd64.json
@@ -550,6 +550,12 @@
       "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/be1bf3cbb34d603837500595770868faf18232f9529e0a375b9527506d4cd711"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -569,6 +575,12 @@
       "/path/to/tmp/json"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
@@ -597,6 +609,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.install XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -610,6 +628,12 @@
       "[CACHE]/macos_sdk/XCode.app"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.select XCode 14e222b",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -623,6 +647,12 @@
       "--show-sdk-path"
     ],
     "infra_step": true,
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      }
+    },
     "name": "ensure XCode 14e222b.xcrun",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/rust_toolchain.expected/rust_intel_mac_beta.json b/recipes/rust_toolchain.expected/rust_intel_mac_beta.json
index e0a7be9..09037db 100644
--- a/recipes/rust_toolchain.expected/rust_intel_mac_beta.json
+++ b/recipes/rust_toolchain.expected/rust_intel_mac_beta.json
@@ -1109,6 +1109,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1140,6 +1144,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1180,6 +1188,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1205,6 +1217,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1230,6 +1246,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -2047,8 +2067,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2194,7 +2214,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2525,7 +2545,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"linux-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"linux-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -2567,7 +2587,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000004500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
@@ -2621,7 +2641,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers (2)",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00002\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00002\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000007500000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -2663,7 +2683,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000007500000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
diff --git a/recipes/rust_toolchain.expected/rust_intel_mac_main.json b/recipes/rust_toolchain.expected/rust_intel_mac_main.json
index 07be9b0..3a21c19 100644
--- a/recipes/rust_toolchain.expected/rust_intel_mac_main.json
+++ b/recipes/rust_toolchain.expected/rust_intel_mac_main.json
@@ -1109,6 +1109,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1140,6 +1144,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1180,6 +1188,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1205,6 +1217,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -1230,6 +1246,10 @@
     ],
     "infra_step": true,
     "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337001201.5
+      },
       "realm": {
         "name": "fuchsia:ci"
       },
@@ -2081,8 +2101,8 @@
       "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
       "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:21.500000\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000003000@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:23\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000004500@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -2228,7 +2248,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
-      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:23\", \"time_stamp_int\": 1337000004500}}"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -2559,7 +2579,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"linux-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"linux-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -2601,7 +2621,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000004500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
@@ -2655,7 +2675,7 @@
       }
     },
     "name": "luci-scheduler.EmitTriggers (2)",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00002\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000006000000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"mac-x64-builder\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"$fuchsia/checkout\": {\"gitiles_commit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"h3ll0\", \"project\": \"integration\"}, \"rust_toolchain\": {\"cas_digest\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"cas_instance\": \"projects/example-cas-server/instances/default_instance\"}}, \"rust_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/rust\", \"git_revision\": \"deadbeef\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/third_party/rust/+/deadbeef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00002\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000007500000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -2697,7 +2717,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ],@@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000006000000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000007500000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]