checkout: Use submodule_timeout git_checkout arg

Change-Id: Ic8cef296826cbb8827365f77b1c89cd0ea8c1237
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/181010
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/checkout/api.py b/recipe_modules/checkout/api.py
index 3f5125b..e19dece 100644
--- a/recipe_modules/checkout/api.py
+++ b/recipe_modules/checkout/api.py
@@ -969,6 +969,7 @@
                     submodules=submodules,
                     submodule_force=submodules,
                     submodule_paths=submodule_paths,
+                    submodule_timeout=submodule_timeout_sec,
                     step_name="",
                     use_packfiles=use_packfiles,
                 )
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index 55bfee9..8d6b46b 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index abb54f0..1cc3537 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -581,7 +581,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index 8c8f10e..70163a1 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/trigger.json b/recipe_modules/checkout/tests/git.expected/trigger.json
index 7cb174a..ce2f6a9 100644
--- a/recipe_modules/checkout/tests/git.expected/trigger.json
+++ b/recipe_modules/checkout/tests/git.expected/trigger.json
@@ -940,7 +940,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 44a75e1..8e75d55 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -991,7 +991,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/bazel.expected/simple.json b/recipes/bazel.expected/simple.json
index 4506ef5..b06b824 100644
--- a/recipes/bazel.expected/simple.json
+++ b/recipes/bazel.expected/simple.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 9ee8fb5..b541b04 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/build.expected/skip_archive.json b/recipes/build.expected/skip_archive.json
index 8033c58..ce18323 100644
--- a/recipes/build.expected/skip_archive.json
+++ b/recipes/build.expected/skip_archive.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/bad_package_spec.json b/recipes/cipd_roller.expected/bad_package_spec.json
index 9ca6a0a..ed229a9 100644
--- a/recipes/cipd_roller.expected/bad_package_spec.json
+++ b/recipes/cipd_roller.expected/bad_package_spec.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/missing_tag.json b/recipes/cipd_roller.expected/missing_tag.json
index 6862c7a..8dce954 100644
--- a/recipes/cipd_roller.expected/missing_tag.json
+++ b/recipes/cipd_roller.expected/missing_tag.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/multiple.json b/recipes/cipd_roller.expected/multiple.json
index 661c053..53f6081 100644
--- a/recipes/cipd_roller.expected/multiple.json
+++ b/recipes/cipd_roller.expected/multiple.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/multiple_common_tags.json b/recipes/cipd_roller.expected/multiple_common_tags.json
index 933b417..5cf61ed 100644
--- a/recipes/cipd_roller.expected/multiple_common_tags.json
+++ b/recipes/cipd_roller.expected/multiple_common_tags.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags.json b/recipes/cipd_roller.expected/no_common_tags.json
index 352211e..b5a737c 100644
--- a/recipes/cipd_roller.expected/no_common_tags.json
+++ b/recipes/cipd_roller.expected/no_common_tags.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
index e78586e..a9ec02a 100644
--- a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
+++ b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index 76f149e..0d9c8d5 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index a00b73e..dfa229d 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index bddebec..a8cd705 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/rc.json b/recipes/cipd_roller.expected/rc.json
index 55be487..5981cac 100644
--- a/recipes/cipd_roller.expected/rc.json
+++ b/recipes/cipd_roller.expected/rc.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index 7a8c03d..6776652 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/docs_builder.expected/docs-dry_run-build.json b/recipes/docs_builder.expected/docs-dry_run-build.json
index 0415422..2f18241 100644
--- a/recipes/docs_builder.expected/docs-dry_run-build.json
+++ b/recipes/docs_builder.expected/docs-dry_run-build.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/docs_builder.expected/docs-postsubmit.json b/recipes/docs_builder.expected/docs-postsubmit.json
index 159b395..acffb46 100644
--- a/recipes/docs_builder.expected/docs-postsubmit.json
+++ b/recipes/docs_builder.expected/docs-postsubmit.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/docs_builder.expected/docs-presubmit.json b/recipes/docs_builder.expected/docs-presubmit.json
index cf1974b..d7d0f1a 100644
--- a/recipes/docs_builder.expected/docs-presubmit.json
+++ b/recipes/docs_builder.expected/docs-presubmit.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index bf59453..242179a 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 1785761..bb5e0ce 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index fbc882c..54cf109 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index dfbfa11..5719f66 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index e5e4a94..2026efa 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json b/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
index 51b98dc..97110cf 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_not_in_cv.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json b/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
index 5eb7d91..f693c1e 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_not_tryjob.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json b/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
index 51b98dc..97110cf 100644
--- a/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
+++ b/recipes/pw_presubmit.expected/one_step_no_exit_passing_in_ci.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index b2cb540..9496c1a 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -888,7 +888,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index 2aa16e9..573445b 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index 22dd33e..87adf8f 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/recipes.expected/unittest-only.json b/recipes/recipes.expected/unittest-only.json
index 3b21a9f..b2359eb 100644
--- a/recipes/recipes.expected/unittest-only.json
+++ b/recipes/recipes.expected/unittest-only.json
@@ -998,7 +998,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/backwards.json b/recipes/repo_roller.expected/backwards.json
index 705c42d..0e60b2b 100644
--- a/recipes/repo_roller.expected/backwards.json
+++ b/recipes/repo_roller.expected/backwards.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index f66d541..98a22ad 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index a8a43ce..a669e77 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index cf3064e..f07b22d 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index db01632..6b230bc 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/name-not-found.json b/recipes/repo_roller.expected/name-not-found.json
index 2453efe..b1cccf0 100644
--- a/recipes/repo_roller.expected/name-not-found.json
+++ b/recipes/repo_roller.expected/name-not-found.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index d224e15..732f337 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
index 05b726f..f057c3d 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
index 6952bce..d0c9a86 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index 7126fa8..f65d947 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index ff6736f..5dcf060 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
index 50445cc..2432b50 100644
--- a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
+++ b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index 2241428..1aff73e 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index b7d4e42..18300f3 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/run_script.expected/variable_substitution.json b/recipes/run_script.expected/variable_substitution.json
index 7eab980..d64af3c 100644
--- a/recipes/run_script.expected/variable_substitution.json
+++ b/recipes/run_script.expected/variable_substitution.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/submodule_roller.expected/missing.json b/recipes/submodule_roller.expected/missing.json
index f311cd2..2e3dd4b 100644
--- a/recipes/submodule_roller.expected/missing.json
+++ b/recipes/submodule_roller.expected/missing.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/submodule_roller.expected/noop.json b/recipes/submodule_roller.expected/noop.json
index 41ac493..0886fb8 100644
--- a/recipes/submodule_roller.expected/noop.json
+++ b/recipes/submodule_roller.expected/noop.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/submodule_roller.expected/partial_noop.json b/recipes/submodule_roller.expected/partial_noop.json
index ed8b639..4fce1fa 100644
--- a/recipes/submodule_roller.expected/partial_noop.json
+++ b/recipes/submodule_roller.expected/partial_noop.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/submodule_roller.expected/success.json b/recipes/submodule_roller.expected/success.json
index 944b9f2..7eac538 100644
--- a/recipes/submodule_roller.expected/success.json
+++ b/recipes/submodule_roller.expected/success.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 4500179..e2a7717 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index 4ece6e9..224413b 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -1115,7 +1115,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index bf610f1..b8cabbb 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -1115,7 +1115,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index bd2eaff..8160cfb 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -1115,7 +1115,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index 40e3e1d..850f38d 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -1115,7 +1115,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index 4a6962a..7a16851 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index 1fe8628..54bc3d8 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index 2233ff7..353d02b 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/txt_roller.expected/bad-trigger.json b/recipes/txt_roller.expected/bad-trigger.json
index b0f453e..5ac5a59 100644
--- a/recipes/txt_roller.expected/bad-trigger.json
+++ b/recipes/txt_roller.expected/bad-trigger.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index 175e2de..aa3a749 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -426,7 +426,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index 563a854..c137d5a 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -688,7 +688,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index 4eb2b4e..b6c1a28 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index 5c7a6bc..59ec04f 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 455dbf1..b7618b3 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -587,7 +587,7 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 6ca8679..b421b51 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -990,7 +990,7 @@
       }
     },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
-    "timeout": 600.0,
+    "timeout": 600,
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]