Roll recipe dependencies (nontrivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM as normal. The recipe roller
will *NOT* CQ the change itself, so you must CQ the change manually.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/05a33f9dcf2289bbaf233fcae1e2fb508d95f528 Record infra_step in recipe expectations (phajdan.jr@chromium.org)

R=phajdan.jr@chromium.org

Change-Id: Ic1202d82b7bb4376976c1b4989cbbd7d26d7c531
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Reviewed-on: https://chromium-review.googlesource.com/454341
Commit-Queue: <recipe-roller@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>

infra/config/recipes.cfg

@@ -5,5 +5,5 @@ deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "2606a110184a3effca282bc1dbed36ee790872bb"
+  revision: "05a33f9dcf2289bbaf233fcae1e2fb508d95f528"
 }

recipe_modules/bot_update/example.expected/apply_gerrit_ref.json

@@ -16,6 +16,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "apply_gerrit"
   },
   {

recipe_modules/bot_update/example.expected/basic.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/basic_output_manifest.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/basic_with_branch_heads.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update - with branch heads",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/buildbot.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/clobber.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/gerrit_no_reset.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/no_shallow.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/reset_root_solution_revision.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/trychange.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json

@@ -26,6 +26,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/trychange_oauth2_json.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob_fail.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/bot_update/example.expected/tryjob_fail_patch.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
@@ -65,6 +66,7 @@
       "-u",
       "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)"
     ],
+    "infra_step": true,
     "name": "Patch failure - Try Rebasing",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob_v8.json

@@ -30,6 +30,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json

@@ -30,6 +30,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

recipe_modules/gclient/example.expected/basic.json

@@ -11,6 +11,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient setup"
   },
   {
@@ -34,6 +35,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -60,6 +62,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.name)"
   },
   {
@@ -76,6 +79,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.email)"
   },
   {
@@ -91,6 +95,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient setup"
   },
   {
@@ -117,6 +122,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -148,6 +154,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
@@ -165,6 +172,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
@@ -174,6 +182,7 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
+    "infra_step": true,
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",

recipe_modules/gclient/example.expected/buildbot.json

@@ -11,6 +11,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient setup"
   },
   {
@@ -34,6 +35,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -60,6 +62,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.name)"
   },
   {
@@ -76,6 +79,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.email)"
   },
   {
@@ -91,6 +95,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient setup"
   },
   {
@@ -117,6 +122,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -148,6 +154,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
@@ -165,6 +172,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
@@ -174,6 +182,7 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
+    "infra_step": true,
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",

recipe_modules/gclient/example.expected/revision.json

@@ -11,6 +11,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient setup"
   },
   {
@@ -36,6 +37,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -62,6 +64,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.name)"
   },
   {
@@ -78,6 +81,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.email)"
   },
   {
@@ -93,6 +97,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient setup"
   },
   {
@@ -121,6 +126,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,6 +158,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
@@ -169,6 +176,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
@@ -178,6 +186,7 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
+    "infra_step": true,
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",

recipe_modules/gclient/example.expected/tryserver.json

@@ -11,6 +11,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient setup"
   },
   {
@@ -36,6 +37,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -62,6 +64,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.name)"
   },
   {
@@ -78,6 +81,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gclient recurse (git config user.email)"
   },
   {
@@ -93,6 +97,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient setup"
   },
   {
@@ -121,6 +126,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,6 +158,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
@@ -169,6 +176,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
@@ -178,6 +186,7 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
+    "infra_step": true,
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",

recipe_modules/gerrit/example.expected/basic.json

@@ -19,6 +19,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gerrit create_gerrit_branch",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -47,6 +48,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "gerrit get_gerrit_branch",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",

recipe_modules/git/example.expected/basic.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -162,6 +175,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -176,6 +190,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -185,6 +200,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -196,6 +212,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/basic_branch.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -162,6 +175,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -176,6 +190,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -185,6 +200,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -196,6 +212,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/basic_file_name.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -36,6 +37,7 @@
       "DEPS"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -45,6 +47,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -60,6 +63,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -69,6 +73,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -80,6 +85,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -91,6 +97,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -102,6 +109,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -117,6 +125,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -128,6 +137,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -136,6 +146,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -144,6 +155,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -152,6 +164,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -164,6 +177,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -178,6 +192,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -187,6 +202,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -198,6 +214,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/basic_hash.json

@@ -23,6 +23,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -33,6 +34,7 @@
       "abcdef0123456789abcdef0123456789abcdef01"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -42,6 +44,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -57,6 +60,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -66,6 +70,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -77,6 +82,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -88,6 +94,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -99,6 +106,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -114,6 +122,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -125,6 +134,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -133,6 +143,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -141,6 +152,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -149,6 +161,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -161,6 +174,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -175,6 +189,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -184,6 +199,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -195,6 +211,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/basic_ref.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -162,6 +175,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -176,6 +190,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -185,6 +200,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -196,6 +212,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/basic_submodule_update_force.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -79,6 +84,7 @@
       "--force"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -90,6 +96,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -101,6 +108,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -116,6 +124,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -127,6 +136,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -135,6 +145,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -143,6 +154,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -151,6 +163,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -163,6 +176,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -177,6 +191,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -186,6 +201,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -197,6 +213,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/can_fail_build.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/git/example.expected/cannot_fail_build.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ -166,6 +179,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -180,6 +194,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -189,6 +204,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -200,6 +216,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/cat-file_test.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -162,6 +175,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -176,6 +190,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -185,6 +200,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -195,6 +211,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags (2)",
     "stdout": "/path/to/tmp/"
   },
@@ -206,6 +223,7 @@
       "abcdef12345:TestFile"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git cat-file abcdef12345:TestFile",
     "stdout": "/path/to/tmp/"
   },
@@ -218,6 +236,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/count-objects_delta.json

@@ -18,6 +18,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects before git fetch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -45,6 +46,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -54,6 +56,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects after git fetch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -107,6 +110,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -116,6 +120,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -131,6 +136,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -140,6 +146,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -151,6 +158,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -162,6 +170,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -173,6 +182,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -188,6 +198,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -199,6 +210,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -207,6 +219,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -215,6 +228,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -223,6 +237,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -235,6 +250,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -249,6 +265,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -258,6 +275,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -269,6 +287,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/count-objects_failed.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -104,6 +111,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -119,6 +127,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -130,6 +139,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -138,6 +148,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -146,6 +157,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -154,6 +166,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -166,6 +179,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -180,6 +194,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -189,6 +204,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -200,6 +216,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/count-objects_with_bad_output.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -105,6 +112,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -120,6 +128,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -131,6 +140,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -139,6 +149,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -147,6 +158,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -155,6 +167,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -167,6 +180,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -181,6 +195,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -190,6 +205,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -201,6 +217,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/git/example.expected/curl_trace_file.json

@@ -25,6 +25,7 @@
       "GIT_CURL_VERBOSE": "1",
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch",
     "stderr": "[START_DIR]/curl_trace.log"
   },
@@ -36,6 +37,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -45,6 +47,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -60,6 +63,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -69,6 +73,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -80,6 +85,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -91,6 +97,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -102,6 +109,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -117,6 +125,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -128,6 +137,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -136,6 +146,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -144,6 +155,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -152,6 +164,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -164,6 +177,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -178,6 +192,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -187,6 +202,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -198,6 +214,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/git-cache-checkout.json

@@ -25,6 +25,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "populate cache"
   },
   {
@@ -41,6 +42,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git cache",
     "stdout": "/path/to/tmp/"
   },
@@ -56,6 +58,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git remote"
   },
   {
@@ -71,6 +74,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -81,6 +85,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -90,6 +95,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -105,6 +111,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -114,6 +121,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -125,6 +133,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -136,6 +145,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -147,6 +157,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -162,6 +173,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -173,6 +185,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -181,6 +194,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -189,6 +203,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -197,6 +212,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -209,6 +225,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -223,6 +240,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -232,6 +250,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -243,6 +262,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/platform_win.json

@@ -7,6 +7,7 @@
       "--verbose"
     ],
     "cwd": "RECIPE_PACKAGE_REPO[depot_tools]",
+    "infra_step": true,
     "name": "ensure git tooling on windows",
     "timeout": 300
   },
@@ -37,6 +38,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -47,6 +49,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -56,6 +59,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -71,6 +75,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -80,6 +85,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -91,6 +97,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -102,6 +109,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -113,6 +121,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -128,6 +137,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -139,6 +149,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -147,6 +158,7 @@
       "status"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -155,6 +167,7 @@
       "status"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -163,6 +176,7 @@
       "status"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -175,6 +189,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -189,6 +204,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools];%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -198,6 +214,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -209,6 +226,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]\\src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/rebase_failed.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -58,6 +61,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -67,6 +71,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -78,6 +83,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -89,6 +95,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -100,6 +107,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -115,6 +123,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,6 +135,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -134,6 +144,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -142,6 +153,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -150,6 +162,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -162,6 +175,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -176,6 +190,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -185,6 +200,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ -198,6 +214,7 @@
       "--abort"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase abort"
   },
   {

recipe_modules/git/example.expected/remote_not_origin.json

@@ -26,6 +26,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -36,6 +37,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -45,6 +47,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -60,6 +63,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -69,6 +73,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -80,6 +85,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -91,6 +97,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -102,6 +109,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -117,6 +125,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -128,6 +137,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -136,6 +146,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -144,6 +155,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -152,6 +164,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -164,6 +177,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -178,6 +192,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -187,6 +202,7 @@
       "not_origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -198,6 +214,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/git/example.expected/set_got_revision.json

@@ -24,6 +24,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git fetch"
   },
   {
@@ -34,6 +35,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git checkout"
   },
   {
@@ -43,6 +45,7 @@
       "HEAD"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -59,6 +62,7 @@
       "-x"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git clean"
   },
   {
@@ -68,6 +72,7 @@
       "sync"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule sync"
   },
   {
@@ -79,6 +84,7 @@
       "--recursive"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "submodule update"
   },
   {
@@ -90,6 +96,7 @@
       "-v"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "count-objects",
     "stdout": "/path/to/tmp/"
   },
@@ -101,6 +108,7 @@
       "remote.origin.url"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git config remote.origin.url",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -116,6 +124,7 @@
       "-s"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -127,6 +136,7 @@
       "--tags"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git fetch tags"
   },
   {
@@ -135,6 +145,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status"
   },
   {
@@ -143,6 +154,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status can_fail_build"
   },
   {
@@ -151,6 +163,7 @@
       "status"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git status cannot_fail_build"
   },
   {
@@ -163,6 +176,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch refactor"
   },
   {
@@ -177,6 +191,7 @@
     "env": {
       "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
     },
+    "infra_step": true,
     "name": "git new-branch feature"
   },
   {
@@ -186,6 +201,7 @@
       "origin/master"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "my repo rebase"
   },
   {
@@ -197,6 +213,7 @@
       "--all"
     ],
     "cwd": "[START_DIR]/src",
+    "infra_step": true,
     "name": "git bundle"
   },
   {

recipe_modules/gsutil/example.expected/basic.json

@@ -19,6 +19,7 @@
       "[TMP_BASE]/boom",
       "gs://example/some/random/path/to/boom"
     ],
+    "infra_step": true,
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.googleapis.com/example/some/random/path/to/boom@@@"
@@ -45,6 +46,7 @@
       "[TMP_BASE]/boom",
       "gs://example/some/random/path/to/boom"
     ],
+    "infra_step": true,
     "name": "gsutil upload (2)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.googleapis.com/example/some/random/path/to/boom@@@"
@@ -62,6 +64,7 @@
       "gs://example/some/random/path/**",
       "gs://example/staging"
     ],
+    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -78,6 +81,7 @@
       "gs://example/some/random/path/**",
       "gs://example/staging"
     ],
+    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -92,6 +96,7 @@
       "gs://example/some/random/path/to/boom",
       "[TMP_BASE]/boom"
     ],
+    "infra_step": true,
     "name": "gsutil gsutil download url"
   },
   {
@@ -106,6 +111,7 @@
       "gs://example/staging/to/boom",
       "[TMP_BASE]/erang"
     ],
+    "infra_step": true,
     "name": "gsutil download"
   },
   {
@@ -120,6 +126,7 @@
       "path/to/key",
       "gs://example/some/random/path/to/boom"
     ],
+    "infra_step": true,
     "name": "gsutil signed url"
   },
   {
@@ -133,6 +140,7 @@
       "rm",
       "gs://example/staging/to/boom"
     ],
+    "infra_step": true,
     "name": "gsutil remove"
   },
   {
@@ -146,6 +154,7 @@
       "ls",
       "gs://example/foo"
     ],
+    "infra_step": true,
     "name": "gsutil list"
   },
   {
@@ -160,6 +169,7 @@
       "gs://example/some/random/path/to/boom",
       "gs://example/staging/to/boom"
     ],
+    "infra_step": true,
     "name": "gsutil copy",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.copy@https://storage.cloud.google.com/example/staging/to/boom@@@"
@@ -176,6 +186,7 @@
       "cat",
       "gs://example/foo"
     ],
+    "infra_step": true,
     "name": "gsutil cat"
   },
   {

recipe_modules/tryserver/example.expected/with_gerrit_patch.json

@@ -7,6 +7,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_gerrit_patch_deprecated.json

@@ -7,6 +7,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_git_patch.json

@@ -19,6 +19,7 @@
       "johndoe#123.diff"
     ],
     "cwd": "[TMP_BASE]/patch_tmp_1",
+    "infra_step": true,
     "name": "patch fetch"
   },
   {
@@ -30,6 +31,7 @@
       "-x"
     ],
     "cwd": "[TMP_BASE]/patch_tmp_1",
+    "infra_step": true,
     "name": "patch clean"
   },
   {
@@ -40,6 +42,7 @@
       "FETCH_HEAD"
     ],
     "cwd": "[TMP_BASE]/patch_tmp_1",
+    "infra_step": true,
     "name": "patch git checkout"
   },
   {
@@ -73,6 +76,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]/v8",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_rietveld_patch.json

@@ -53,6 +53,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json

@@ -53,6 +53,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]/sub/project",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_wrong_patch.json

@@ -7,6 +7,7 @@
       "--verbose"
     ],
     "cwd": "RECIPE_PACKAGE_REPO[depot_tools]",
+    "infra_step": true,
     "name": "ensure git tooling on windows",
     "timeout": 300
   },
@@ -18,6 +19,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

recipe_modules/tryserver/example.expected/with_wrong_patch_new.json

@@ -7,6 +7,7 @@
       "--verbose"
     ],
     "cwd": "RECIPE_PACKAGE_REPO[depot_tools]",
+    "infra_step": true,
     "name": "ensure git tooling on windows",
     "timeout": 300
   },
@@ -18,6 +19,7 @@
       "--name-only"
     ],
     "cwd": "[START_DIR]\\sub\\project",
+    "infra_step": true,
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [