diff --git a/recipe_modules/adhoc_validation/api.py b/recipe_modules/adhoc_validation/api.py
index b3d52a9..9c12a92 100644
--- a/recipe_modules/adhoc_validation/api.py
+++ b/recipe_modules/adhoc_validation/api.py
@@ -43,7 +43,11 @@
       self.m.kms.decrypt_secrets(env, secrets)
       if self.m.platform.is_linux or self.m.platform.is_mac:
         resource_name = self.resource('%s.sh' % validation)
-        self.m.step('Set execute permission', ['chmod', '755', resource_name])
+        self.m.step(
+            'Set execute permission',
+            ['chmod', '755', resource_name],
+            infra_step=True,
+        )
       elif self.m.platform.is_win:
         resource_name = self.resource('%s.bat' % validation)
       dep_list = [d['dependency'] for d in deps]
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/linux.json b/recipe_modules/adhoc_validation/examples/full.expected/linux.json
index 09c352b..a99aa98 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/linux.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/linux.json
@@ -24,6 +24,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Docs.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/mac.json b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
index c01469a..93b4577 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/mac.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
@@ -24,6 +24,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Docs.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json b/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json
index 00a2fe5..0f63a41 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json
@@ -24,6 +24,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Docs.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index 7fb2669..edf26fb 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -175,7 +175,8 @@
     with self.m.context(env=env, env_prefixes=env_prefixes):
       self.m.step(
           'Install dashing',
-          ['go', 'get', '-u', 'github.com/technosophos/dashing']
+          ['go', 'get', '-u', 'github.com/technosophos/dashing'],
+          infra_step=True,
       )
 
   def vpython(self, env, env_prefixes, version):
@@ -227,7 +228,8 @@
       with self.m.context(cwd=gem_dir):
         self.m.step(
             'install bundler',
-            ['gem', 'install', 'bundler', '--install-dir', '.']
+            ['gem', 'install', 'bundler', '--install-dir', '.'],
+            infra_step=True,
         )
       env['GEM_HOME'] = gem_dir
       paths = env_prefixes.get('PATH', [])
@@ -236,9 +238,11 @@
       env_prefixes['PATH'] = temp_paths
       with self.m.context(env=env, env_prefixes=env_prefixes, cwd=gemfile_dir):
         self.m.step(
-            'set gems path', ['bundle', 'config', 'set', 'path', gem_dir]
+            'set gems path',
+            ['bundle', 'config', 'set', 'path', gem_dir],
+            infra_step=True,
         )
-        self.m.step('install gems', ['bundler', 'install'])
+        self.m.step('install gems', ['bundler', 'install'], infra_step=True)
       # Update envs to the final destination.
       self.m.file.listdir('list bundle', gem_dir, recursive=True)
       env['GEM_HOME'] = gem_dir.join('ruby', '2.6.0')
@@ -258,15 +262,18 @@
     self.m.file.ensure_directory('ensure directory', firebase_dir)
     with self.m.step.nest('Install firebase'):
       self.m.step(
-          'Install firebase bin', [
+          'Install firebase bin',
+          [
               'curl', '-Lo',
               firebase_dir.join('firebase'),
               'https://firebase.tools/bin/linux/latest'
-          ]
+          ],
+          infra_step=True,
       )
       self.m.step(
           'Set execute permission',
-          ['chmod', '755', firebase_dir.join('firebase')]
+          ['chmod', '755', firebase_dir.join('firebase')],
+          infra_step=True,
       )
     paths = env_prefixes.get('PATH', [])
     paths.append(firebase_dir)
@@ -331,7 +338,11 @@
       env_prefixes(dict):  Current environment prefixes variables.
     """
     with self.m.step.nest('Prepare code signing'):
-      self.m.step('unlock login keychain', ['unlock_login_keychain.sh'])
+      self.m.step(
+          'unlock login keychain',
+          ['unlock_login_keychain.sh'],
+          infra_step=True,
+      )
       # See go/googler-flutter-signing about how to renew the Apple development
       # certificate and provisioning profile.
       env['FLUTTER_XCODE_CODE_SIGN_STYLE'] = 'Manual'
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index cbb7aa0..830e29b 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -235,6 +235,7 @@
         "[CLEANUP]/go_path/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install dashing"
   },
   {
@@ -469,6 +470,7 @@
       "[START_DIR]/firebase/firebase",
       "https://firebase.tools/bin/linux/latest"
     ],
+    "infra_step": true,
     "name": "Install firebase.Install firebase bin",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -480,6 +482,7 @@
       "755",
       "[START_DIR]/firebase/firebase"
     ],
+    "infra_step": true,
     "name": "Install firebase.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -592,6 +595,7 @@
     "cmd": [
       "unlock_login_keychain.sh"
     ],
+    "infra_step": true,
     "name": "Prepare code signing.unlock login keychain",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
index c6eb04e..90e51a8 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
@@ -235,6 +235,7 @@
         "[CLEANUP]/go_path/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install dashing"
   },
   {
@@ -536,6 +537,7 @@
       "[START_DIR]/firebase/firebase",
       "https://firebase.tools/bin/linux/latest"
     ],
+    "infra_step": true,
     "name": "Install firebase.Install firebase bin",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -547,6 +549,7 @@
       "755",
       "[START_DIR]/firebase/firebase"
     ],
+    "infra_step": true,
     "name": "Install firebase.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -659,6 +662,7 @@
     "cmd": [
       "unlock_login_keychain.sh"
     ],
+    "infra_step": true,
     "name": "Prepare code signing.unlock login keychain",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index cbb7aa0..830e29b 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -235,6 +235,7 @@
         "[CLEANUP]/go_path/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install dashing"
   },
   {
@@ -469,6 +470,7 @@
       "[START_DIR]/firebase/firebase",
       "https://firebase.tools/bin/linux/latest"
     ],
+    "infra_step": true,
     "name": "Install firebase.Install firebase bin",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -480,6 +482,7 @@
       "755",
       "[START_DIR]/firebase/firebase"
     ],
+    "infra_step": true,
     "name": "Install firebase.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -592,6 +595,7 @@
     "cmd": [
       "unlock_login_keychain.sh"
     ],
+    "infra_step": true,
     "name": "Prepare code signing.unlock login keychain",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 920b1f8..f14ae9e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -235,6 +235,7 @@
         "[CLEANUP]/go_path/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install dashing"
   },
   {
@@ -531,6 +532,7 @@
       "[START_DIR]/firebase/firebase",
       "https://firebase.tools/bin/linux/latest"
     ],
+    "infra_step": true,
     "name": "Install firebase.Install firebase bin",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -542,6 +544,7 @@
       "755",
       "[START_DIR]/firebase/firebase"
     ],
+    "infra_step": true,
     "name": "Install firebase.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -654,6 +657,7 @@
     "cmd": [
       "unlock_login_keychain.sh"
     ],
+    "infra_step": true,
     "name": "Prepare code signing.unlock login keychain",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
index 793df7c..c69ac56 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
@@ -235,6 +235,7 @@
         "[CLEANUP]/go_path/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install dashing"
   },
   {
@@ -469,6 +470,7 @@
       "[START_DIR]/firebase/firebase",
       "https://firebase.tools/bin/linux/latest"
     ],
+    "infra_step": true,
     "name": "Install firebase.Install firebase bin",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -480,6 +482,7 @@
       "755",
       "[START_DIR]/firebase/firebase"
     ],
+    "infra_step": true,
     "name": "Install firebase.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -592,6 +595,7 @@
     "cmd": [
       "unlock_login_keychain.sh"
     ],
+    "infra_step": true,
     "name": "Prepare code signing.unlock login keychain",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -686,6 +690,7 @@
         "[START_DIR]/flutter\\ sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install gems.install bundler",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -719,6 +724,7 @@
         "[START_DIR]/flutter\\ sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install gems.set gems path",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -749,6 +755,7 @@
         "[START_DIR]/flutter\\ sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "Install gems.install gems",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 9a8d8f8..7b71791 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -40,21 +40,31 @@
   def collect_os_info(self):
     """Collects meminfo, cpu, processes for mac"""
     if self.m.platform.is_mac:
-      self.m.step('OS info', cmd=['top', '-l', '3', '-o', 'mem'])
+      self.m.step(
+          'OS info',
+          cmd=['top', '-l', '3', '-o', 'mem'],
+          infra_step=True,
+      )
       # These are temporary steps to collect xattr info for triage purpose.
       # See issue: https://github.com/flutter/flutter/issues/68322#issuecomment-740264251
       self.m.step(
           'python xattr info',
           cmd=['xattr', '/opt/s/w/ir/cipd_bin_packages/python'],
-          ok_ret='any'
+          ok_ret='any',
+          infra_step=True,
       )
       self.m.step(
           'git xattr info',
           cmd=['xattr', '/opt/s/w/ir/cipd_bin_packages/git'],
-          ok_ret='any'
+          ok_ret='any',
+          infra_step=True,
       )
     elif self.m.platform.is_linux:
-      self.m.step('OS info', cmd=['top', '-b', '-n', '3', '-o', '%MEM'])
+      self.m.step(
+          'OS info',
+          cmd=['top', '-b', '-n', '3', '-o', '%MEM'],
+          infra_step=True,
+      )
 
   def kill_processes(self):
     """Kills processes.
diff --git a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
index 2f93c94..6aa91fa 100644
--- a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
+++ b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
@@ -83,6 +83,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -90,6 +91,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -97,6 +99,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipe_modules/os_utils/examples/full.expected/linux_linux.json b/recipe_modules/os_utils/examples/full.expected/linux_linux.json
index 2cc946b..5e6054d 100644
--- a/recipe_modules/os_utils/examples/full.expected/linux_linux.json
+++ b/recipe_modules/os_utils/examples/full.expected/linux_linux.json
@@ -67,6 +67,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipe_modules/os_utils/examples/full.expected/mac_linux.json b/recipe_modules/os_utils/examples/full.expected/mac_linux.json
index 860f15f..5748295 100644
--- a/recipe_modules/os_utils/examples/full.expected/mac_linux.json
+++ b/recipe_modules/os_utils/examples/full.expected/mac_linux.json
@@ -83,6 +83,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -90,6 +91,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -97,6 +99,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index 307ea70..72b6f48 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
index 9c7dcc2..f0500d2 100644
--- a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20233,6 +20234,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index f540497..a1e7300 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15328,6 +15329,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index a043462..92cc0bf 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15318,6 +15319,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index 18dee7e..d228bdd 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19432,6 +19433,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json
index 38882f7..837cf6e 100644
--- a/recipes/engine.expected/first_bot_update_failed.json
+++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15491,6 +15492,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/gcloud_pubsub_failure.json b/recipes/engine.expected/gcloud_pubsub_failure.json
index 158dbda..c346471 100644
--- a/recipes/engine.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 4354d56..89ecd93 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15318,6 +15319,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index 4354d56..89ecd93 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15318,6 +15319,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
index 404119c..1a141bd 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15333,6 +15334,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
index 4354d56..89ecd93 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15318,6 +15319,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index 404119c..1a141bd 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15333,6 +15334,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_no_lto.json b/recipes/engine.expected/linux_no_lto.json
index 404119c..1a141bd 100644
--- a/recipes/engine.expected/linux_no_lto.json
+++ b/recipes/engine.expected/linux_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15333,6 +15334,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_publish_cipd.json b/recipes/engine.expected/linux_publish_cipd.json
index 4354d56..89ecd93 100644
--- a/recipes/engine.expected/linux_publish_cipd.json
+++ b/recipes/engine.expected/linux_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15318,6 +15319,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto.json b/recipes/engine.expected/linux_publish_cipd_no_lto.json
index 404119c..1a141bd 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15333,6 +15334,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index 2e504ef..a891cd7 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19580,6 +19581,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index a9beabc..5806dee 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18536,6 +18537,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
index 7061131..65dff2d 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18551,6 +18552,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index daf1926..e1f8583 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19174,6 +19175,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 2c53099..d0a013c 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19189,6 +19190,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index 4dfce90..a552c7a 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19595,6 +19596,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index e9fc167..92ebe31 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20218,6 +20219,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index a94295f..dc3b86a 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20233,6 +20234,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index e8216ae..a6c57db 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10076,6 +10079,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10083,6 +10087,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10090,6 +10095,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index b6fd42e..acd0515 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11766,6 +11769,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11773,6 +11777,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11780,6 +11785,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
index 2819e9d..f394dd1 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11780,6 +11783,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11787,6 +11791,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11794,6 +11799,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
index b6fd42e..acd0515 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11766,6 +11769,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11773,6 +11777,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11780,6 +11785,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 2819e9d..f394dd1 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11780,6 +11783,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11787,6 +11791,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11794,6 +11799,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_no_lto.json b/recipes/engine.expected/mac_no_lto.json
index 6877391..563579a 100644
--- a/recipes/engine.expected/mac_no_lto.json
+++ b/recipes/engine.expected/mac_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10090,6 +10093,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10097,6 +10101,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10104,6 +10109,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_publish_cipd.json b/recipes/engine.expected/mac_publish_cipd.json
index e8216ae..a6c57db 100644
--- a/recipes/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine.expected/mac_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10076,6 +10079,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10083,6 +10087,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10090,6 +10095,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine.expected/mac_publish_cipd_no_lto.json
index 6877391..563579a 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10090,6 +10093,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10097,6 +10101,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10104,6 +10109,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index 5305d71..ef0fcf2 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11980,6 +11983,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11987,6 +11991,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11994,6 +11999,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index 460754e..779d17d 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13518,6 +13521,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13525,6 +13529,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13532,6 +13537,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
index 28ddcae..eec1e32 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13532,6 +13535,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13539,6 +13543,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13546,6 +13551,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 460754e..779d17d 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13518,6 +13521,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13525,6 +13529,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13532,6 +13537,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 28ddcae..eec1e32 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13532,6 +13535,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13539,6 +13543,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13546,6 +13551,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_no_lto.json b/recipes/engine.expected/mac_upload_no_lto.json
index 6e71d2c..37bcef3 100644
--- a/recipes/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine.expected/mac_upload_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11994,6 +11997,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -12001,6 +12005,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12008,6 +12013,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_publish_cipd.json b/recipes/engine.expected/mac_upload_publish_cipd.json
index 5305d71..ef0fcf2 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11980,6 +11983,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11987,6 +11991,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11994,6 +11999,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
index 6e71d2c..37bcef3 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11994,6 +11997,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -12001,6 +12005,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12008,6 +12013,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index f540497..a1e7300 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15328,6 +15329,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/clobber.json b/recipes/engine/engine_arm.expected/clobber.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm.expected/clobber.json
+++ b/recipes/engine/engine_arm.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/experimental.json b/recipes/engine/engine_arm.expected/experimental.json
index 7899668..df42d3f 100644
--- a/recipes/engine/engine_arm.expected/experimental.json
+++ b/recipes/engine/engine_arm.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/experimental_upload.json b/recipes/engine/engine_arm.expected/experimental_upload.json
index a555e0d..707bf49 100644
--- a/recipes/engine/engine_arm.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
index 9d9ac52..12953eb 100644
--- a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2064,6 +2065,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/linux.json b/recipes/engine/engine_arm.expected/linux.json
index f88fefe..6ad02a4 100644
--- a/recipes/engine/engine_arm.expected/linux.json
+++ b/recipes/engine/engine_arm.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/linux_upload.json b/recipes/engine/engine_arm.expected/linux_upload.json
index 6eb5f5b..b3e3947 100644
--- a/recipes/engine/engine_arm.expected/linux_upload.json
+++ b/recipes/engine/engine_arm.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/mac.json b/recipes/engine/engine_arm.expected/mac.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm.expected/mac.json
+++ b/recipes/engine/engine_arm.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/mac_upload.json b/recipes/engine/engine_arm.expected/mac_upload.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm.expected/mac_upload.json
+++ b/recipes/engine/engine_arm.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/pull_request.json b/recipes/engine/engine_arm.expected/pull_request.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm.expected/pull_request.json
+++ b/recipes/engine/engine_arm.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/clobber.json b/recipes/engine/engine_arm_1_26_0.expected/clobber.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/clobber.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/experimental.json b/recipes/engine/engine_arm_1_26_0.expected/experimental.json
index 7899668..df42d3f 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/experimental.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json b/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
index a555e0d..707bf49 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
index 9d9ac52..12953eb 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2064,6 +2065,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/linux.json b/recipes/engine/engine_arm_1_26_0.expected/linux.json
index f88fefe..6ad02a4 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/linux.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json b/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
index 6eb5f5b..b3e3947 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/mac.json b/recipes/engine/engine_arm_1_26_0.expected/mac.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/mac.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json b/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/pull_request.json b/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/clobber.json b/recipes/engine/engine_arm_1_27_0.expected/clobber.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/clobber.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/experimental.json b/recipes/engine/engine_arm_1_27_0.expected/experimental.json
index 7899668..df42d3f 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/experimental.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json b/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
index a555e0d..707bf49 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
index 9d9ac52..12953eb 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2064,6 +2065,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/linux.json b/recipes/engine/engine_arm_1_27_0.expected/linux.json
index f88fefe..6ad02a4 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/linux.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2059,6 +2060,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json b/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
index 6eb5f5b..b3e3947 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2493,6 +2494,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/mac.json b/recipes/engine/engine_arm_1_27_0.expected/mac.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/mac.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json b/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
index b43408b..15300c9 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/pull_request.json b/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
index 8389beb..60fb07c 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -2061,6 +2062,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_metrics.expected/basic.json b/recipes/engine/engine_metrics.expected/basic.json
index 978f20f..b0404bf 100644
--- a/recipes/engine/engine_metrics.expected/basic.json
+++ b/recipes/engine/engine_metrics.expected/basic.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -656,6 +657,7 @@
         "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_metrics_1_26_0.expected/basic.json b/recipes/engine/engine_metrics_1_26_0.expected/basic.json
index 01166fa..be86fd8 100644
--- a/recipes/engine/engine_metrics_1_26_0.expected/basic.json
+++ b/recipes/engine/engine_metrics_1_26_0.expected/basic.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -643,6 +644,7 @@
         "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/engine_metrics_1_27_0.expected/basic.json b/recipes/engine/engine_metrics_1_27_0.expected/basic.json
index 01166fa..be86fd8 100644
--- a/recipes/engine/engine_metrics_1_27_0.expected/basic.json
+++ b/recipes/engine/engine_metrics_1_27_0.expected/basic.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -643,6 +644,7 @@
         "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_0.json b/recipes/engine/scenarios.expected/with_failure_upload_0.json
index aaf244c..48d839b 100644
--- a/recipes/engine/scenarios.expected/with_failure_upload_0.json
+++ b/recipes/engine/scenarios.expected/with_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1283,6 +1284,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_1.json b/recipes/engine/scenarios.expected/with_failure_upload_1.json
index 75a5eb4..5c4c7dd 100644
--- a/recipes/engine/scenarios.expected/with_failure_upload_1.json
+++ b/recipes/engine/scenarios.expected/with_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1348,6 +1349,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_0.json b/recipes/engine/scenarios.expected/without_failure_upload_0.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload_0.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_1.json b/recipes/engine/scenarios.expected/without_failure_upload_1.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload_1.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_0.json b/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_0.json
index aaf244c..48d839b 100644
--- a/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_0.json
+++ b/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1283,6 +1284,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_1.json b/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_1.json
index 75a5eb4..5c4c7dd 100644
--- a/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_1.json
+++ b/recipes/engine/scenarios_1_26_0.expected/with_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1348,6 +1349,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_0.json b/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_0.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_0.json
+++ b/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_1.json b/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_1.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_1.json
+++ b/recipes/engine/scenarios_1_26_0.expected/without_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_0.json b/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_0.json
index aaf244c..48d839b 100644
--- a/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_0.json
+++ b/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1283,6 +1284,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_1.json b/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_1.json
index 75a5eb4..5c4c7dd 100644
--- a/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_1.json
+++ b/recipes/engine/scenarios_1_27_0.expected/with_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1348,6 +1349,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_0.json b/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_0.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_0.json
+++ b/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_0.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_1.json b/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_1.json
index cc55acb..f0f1ac6 100644
--- a/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_1.json
+++ b/recipes/engine/scenarios_1_27_0.expected/without_failure_upload_1.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1223,6 +1224,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/web_engine_drone.expected/linux-experimental.json b/recipes/engine/web_engine_drone.expected/linux-experimental.json
index dc3fc90..6a58d37 100644
--- a/recipes/engine/web_engine_drone.expected/linux-experimental.json
+++ b/recipes/engine/web_engine_drone.expected/linux-experimental.json
@@ -817,6 +817,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json b/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
index e9bbaf9..9e4d192 100644
--- a/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
+++ b/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
@@ -925,6 +925,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone.expected/linux-post-submit.json b/recipes/engine/web_engine_drone.expected/linux-post-submit.json
index bdb1c2b..970f39a 100644
--- a/recipes/engine/web_engine_drone.expected/linux-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/linux-post-submit.json
@@ -1061,6 +1061,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone.expected/mac-post-submit.json b/recipes/engine/web_engine_drone.expected/mac-post-submit.json
index d60548d..e3717ca 100644
--- a/recipes/engine/web_engine_drone.expected/mac-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/mac-post-submit.json
@@ -1062,6 +1062,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1093,6 +1094,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -1124,6 +1126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_26_0.expected/linux-experimental.json b/recipes/engine/web_engine_drone_1_26_0.expected/linux-experimental.json
index bbfa137..c82300d 100644
--- a/recipes/engine/web_engine_drone_1_26_0.expected/linux-experimental.json
+++ b/recipes/engine/web_engine_drone_1_26_0.expected/linux-experimental.json
@@ -703,6 +703,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_26_0.expected/linux-firefox-integration.json b/recipes/engine/web_engine_drone_1_26_0.expected/linux-firefox-integration.json
index b294906..28efb7b 100644
--- a/recipes/engine/web_engine_drone_1_26_0.expected/linux-firefox-integration.json
+++ b/recipes/engine/web_engine_drone_1_26_0.expected/linux-firefox-integration.json
@@ -807,6 +807,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_26_0.expected/linux-post-submit.json b/recipes/engine/web_engine_drone_1_26_0.expected/linux-post-submit.json
index 24d8af9..b22d7e0 100644
--- a/recipes/engine/web_engine_drone_1_26_0.expected/linux-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_26_0.expected/linux-post-submit.json
@@ -943,6 +943,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_26_0.expected/mac-post-submit.json b/recipes/engine/web_engine_drone_1_26_0.expected/mac-post-submit.json
index 34e3be8..5773d33 100644
--- a/recipes/engine/web_engine_drone_1_26_0.expected/mac-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_26_0.expected/mac-post-submit.json
@@ -936,6 +936,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -965,6 +966,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -994,6 +996,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_27_0.expected/linux-experimental.json b/recipes/engine/web_engine_drone_1_27_0.expected/linux-experimental.json
index bbfa137..c82300d 100644
--- a/recipes/engine/web_engine_drone_1_27_0.expected/linux-experimental.json
+++ b/recipes/engine/web_engine_drone_1_27_0.expected/linux-experimental.json
@@ -703,6 +703,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_27_0.expected/linux-firefox-integration.json b/recipes/engine/web_engine_drone_1_27_0.expected/linux-firefox-integration.json
index b294906..28efb7b 100644
--- a/recipes/engine/web_engine_drone_1_27_0.expected/linux-firefox-integration.json
+++ b/recipes/engine/web_engine_drone_1_27_0.expected/linux-firefox-integration.json
@@ -807,6 +807,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_27_0.expected/linux-post-submit.json b/recipes/engine/web_engine_drone_1_27_0.expected/linux-post-submit.json
index 24d8af9..b22d7e0 100644
--- a/recipes/engine/web_engine_drone_1_27_0.expected/linux-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_27_0.expected/linux-post-submit.json
@@ -943,6 +943,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine/web_engine_drone_1_27_0.expected/mac-post-submit.json b/recipes/engine/web_engine_drone_1_27_0.expected/mac-post-submit.json
index 34e3be8..5773d33 100644
--- a/recipes/engine/web_engine_drone_1_27_0.expected/mac-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_27_0.expected/mac-post-submit.json
@@ -936,6 +936,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -965,6 +966,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -994,6 +996,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index 8a336df..dcec270 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1534,6 +1535,7 @@
         "[CLEANUP]/tmp_tmp_1/curl"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/web_engine_framework_1_26_0.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework_1_26_0.expected/linux-pre-submit.json
index 34cf37f..a68ea3b 100644
--- a/recipes/engine/web_engine_framework_1_26_0.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework_1_26_0.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1466,6 +1467,7 @@
         "[CACHE]/chrome/drivers"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine/web_engine_framework_1_27_0.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework_1_27_0.expected/linux-pre-submit.json
index 7124d23..3132af9 100644
--- a/recipes/engine/web_engine_framework_1_27_0.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework_1_27_0.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1502,6 +1503,7 @@
         "[CLEANUP]/tmp_tmp_1/curl"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/Linux Fuchsia failing test.json b/recipes/engine_1_26_0.expected/Linux Fuchsia failing test.json
index 03fd888..be8bab4 100644
--- a/recipes/engine_1_26_0.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine_1_26_0.expected/Linux Fuchsia failing test.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
index f2673c9..d7ba5fa 100644
--- a/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_26_0.expected/Linux Fuchsia skips on duplicate.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20165,6 +20166,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/clobber.json b/recipes/engine_1_26_0.expected/clobber.json
index 46daabf..e1e374b 100644
--- a/recipes/engine_1_26_0.expected/clobber.json
+++ b/recipes/engine_1_26_0.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15260,6 +15261,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/experimental.json b/recipes/engine_1_26_0.expected/experimental.json
index 7b90e24..75c0d3a 100644
--- a/recipes/engine_1_26_0.expected/experimental.json
+++ b/recipes/engine_1_26_0.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/experimental_upload.json b/recipes/engine_1_26_0.expected/experimental_upload.json
index 734f513..1aba91e 100644
--- a/recipes/engine_1_26_0.expected/experimental_upload.json
+++ b/recipes/engine_1_26_0.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19364,6 +19365,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/first_bot_update_failed.json b/recipes/engine_1_26_0.expected/first_bot_update_failed.json
index be40ddc..4a9ecca 100644
--- a/recipes/engine_1_26_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_26_0.expected/first_bot_update_failed.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15423,6 +15424,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json b/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
index 8a8ceb4..bbde9af 100644
--- a/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine_1_26_0.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15263,6 +15264,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux.json b/recipes/engine_1_26_0.expected/linux.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_26_0.expected/linux.json
+++ b/recipes/engine_1_26_0.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_no_lto.json b/recipes/engine_1_26_0.expected/linux_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_26_0.expected/linux_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_publish_cipd.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_26_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload.json b/recipes/engine_1_26_0.expected/linux_upload.json
index 5ec7cd4..e62eb60 100644
--- a/recipes/engine_1_26_0.expected/linux_upload.json
+++ b/recipes/engine_1_26_0.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19512,6 +19513,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
index a6651b4..7698c11 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18468,6 +18469,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
index f67580d..a9355f7 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18483,6 +18484,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index a5ade61..8a290bf 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19106,6 +19107,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 8957f43..3bc5889 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19121,6 +19122,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
index 56bb077..aef3fe0 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19527,6 +19528,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
index 9a2ff3a..751869a 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20150,6 +20151,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
index 20894f4..07c5872 100644
--- a/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/linux_upload_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20165,6 +20166,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac.json b/recipes/engine_1_26_0.expected/mac.json
index 35ded3c..a8662d9 100644
--- a/recipes/engine_1_26_0.expected/mac.json
+++ b/recipes/engine_1_26_0.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10074,6 +10077,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10081,6 +10085,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10088,6 +10093,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
index d124bf5..15f936d 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11764,6 +11767,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11771,6 +11775,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11778,6 +11783,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
index 989e930..501aa23 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11778,6 +11781,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11785,6 +11789,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11792,6 +11797,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
index d124bf5..15f936d 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11764,6 +11767,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11771,6 +11775,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11778,6 +11783,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 989e930..501aa23 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11778,6 +11781,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11785,6 +11789,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11792,6 +11797,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_no_lto.json b/recipes/engine_1_26_0.expected/mac_no_lto.json
index 1658c9e..8df6487 100644
--- a/recipes/engine_1_26_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10088,6 +10091,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10095,6 +10099,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10102,6 +10107,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
index 35ded3c..a8662d9 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10074,6 +10077,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10081,6 +10085,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10088,6 +10093,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
index 1658c9e..8df6487 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10088,6 +10091,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10095,6 +10099,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10102,6 +10107,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload.json b/recipes/engine_1_26_0.expected/mac_upload.json
index ec3a8960..df59325 100644
--- a/recipes/engine_1_26_0.expected/mac_upload.json
+++ b/recipes/engine_1_26_0.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11978,6 +11981,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11985,6 +11989,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11992,6 +11997,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
index d31eea2..75aab82 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13516,6 +13519,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13523,6 +13527,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13530,6 +13535,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index 8c4e8c7..bf5d4f0 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13530,6 +13533,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13537,6 +13541,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13544,6 +13549,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index d31eea2..75aab82 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13516,6 +13519,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13523,6 +13527,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13530,6 +13535,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 8c4e8c7..bf5d4f0 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13530,6 +13533,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13537,6 +13541,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13544,6 +13549,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
index a868022..22b0aae 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11992,6 +11995,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11999,6 +12003,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12006,6 +12011,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
index ec3a8960..df59325 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11978,6 +11981,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11985,6 +11989,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11992,6 +11997,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
index a868022..22b0aae 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11992,6 +11995,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11999,6 +12003,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12006,6 +12011,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/pull_request.json b/recipes/engine_1_26_0.expected/pull_request.json
index 46daabf..e1e374b 100644
--- a/recipes/engine_1_26_0.expected/pull_request.json
+++ b/recipes/engine_1_26_0.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15260,6 +15261,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/Linux Fuchsia failing test.json b/recipes/engine_1_27_0.expected/Linux Fuchsia failing test.json
index c55a489..9635ff7 100644
--- a/recipes/engine_1_27_0.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine_1_27_0.expected/Linux Fuchsia failing test.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
index ab9edad..e7b59eb 100644
--- a/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine_1_27_0.expected/Linux Fuchsia skips on duplicate.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20165,6 +20166,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/clobber.json b/recipes/engine_1_27_0.expected/clobber.json
index 46daabf..e1e374b 100644
--- a/recipes/engine_1_27_0.expected/clobber.json
+++ b/recipes/engine_1_27_0.expected/clobber.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15260,6 +15261,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/experimental.json b/recipes/engine_1_27_0.expected/experimental.json
index 7b90e24..75c0d3a 100644
--- a/recipes/engine_1_27_0.expected/experimental.json
+++ b/recipes/engine_1_27_0.expected/experimental.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/experimental_upload.json b/recipes/engine_1_27_0.expected/experimental_upload.json
index 5410b1a..5b1d9d4 100644
--- a/recipes/engine_1_27_0.expected/experimental_upload.json
+++ b/recipes/engine_1_27_0.expected/experimental_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19364,6 +19365,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/first_bot_update_failed.json b/recipes/engine_1_27_0.expected/first_bot_update_failed.json
index be40ddc..4a9ecca 100644
--- a/recipes/engine_1_27_0.expected/first_bot_update_failed.json
+++ b/recipes/engine_1_27_0.expected/first_bot_update_failed.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15423,6 +15424,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json b/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
index 8a8ceb4..bbde9af 100644
--- a/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine_1_27_0.expected/gcloud_pubsub_failure.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15263,6 +15264,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux.json b/recipes/engine_1_27_0.expected/linux.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_27_0.expected/linux.json
+++ b/recipes/engine_1_27_0.expected/linux.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_no_lto.json b/recipes/engine_1_27_0.expected/linux_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_27_0.expected/linux_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_publish_cipd.json
index 334c5b4..30055a0 100644
--- a/recipes/engine_1_27_0.expected/linux_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15250,6 +15251,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
index a33090e..76dc932 100644
--- a/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15265,6 +15266,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload.json b/recipes/engine_1_27_0.expected/linux_upload.json
index 2ac46f9..5c8904d 100644
--- a/recipes/engine_1_27_0.expected/linux_upload.json
+++ b/recipes/engine_1_27_0.expected/linux_upload.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19512,6 +19513,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
index a000f55..29ff4b7 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18468,6 +18469,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
index d84c31e..45ff29f 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -18483,6 +18484,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 11bc60b..6925fac 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19106,6 +19107,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 58f38f7..fdc715d 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19121,6 +19122,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
index 97d2d70..d18f643 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -19527,6 +19528,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
index 60c6c34..620b34e 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20150,6 +20151,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
index 18f5f6d..7736229 100644
--- a/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/linux_upload_publish_cipd_no_lto.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -20165,6 +20166,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac.json b/recipes/engine_1_27_0.expected/mac.json
index 35ded3c..a8662d9 100644
--- a/recipes/engine_1_27_0.expected/mac.json
+++ b/recipes/engine_1_27_0.expected/mac.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10074,6 +10077,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10081,6 +10085,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10088,6 +10093,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
index d124bf5..15f936d 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11764,6 +11767,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11771,6 +11775,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11778,6 +11783,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
index 989e930..501aa23 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11778,6 +11781,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11785,6 +11789,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11792,6 +11797,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
index d124bf5..15f936d 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11764,6 +11767,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11771,6 +11775,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11778,6 +11783,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 989e930..501aa23 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11778,6 +11781,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11785,6 +11789,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11792,6 +11797,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_no_lto.json b/recipes/engine_1_27_0.expected/mac_no_lto.json
index 1658c9e..8df6487 100644
--- a/recipes/engine_1_27_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10088,6 +10091,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10095,6 +10099,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10102,6 +10107,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
index 35ded3c..a8662d9 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10074,6 +10077,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10081,6 +10085,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10088,6 +10093,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
index 1658c9e..8df6487 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -10088,6 +10091,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -10095,6 +10099,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -10102,6 +10107,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload.json b/recipes/engine_1_27_0.expected/mac_upload.json
index ec3a8960..df59325 100644
--- a/recipes/engine_1_27_0.expected/mac_upload.json
+++ b/recipes/engine_1_27_0.expected/mac_upload.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11978,6 +11981,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11985,6 +11989,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11992,6 +11997,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
index d31eea2..75aab82 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13516,6 +13519,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13523,6 +13527,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13530,6 +13535,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index 8c4e8c7..bf5d4f0 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13530,6 +13533,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13537,6 +13541,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13544,6 +13549,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index d31eea2..75aab82 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13516,6 +13519,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13523,6 +13527,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13530,6 +13535,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 8c4e8c7..bf5d4f0 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -13530,6 +13533,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -13537,6 +13541,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -13544,6 +13549,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
index a868022..22b0aae 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11992,6 +11995,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11999,6 +12003,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12006,6 +12011,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
index ec3a8960..df59325 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11978,6 +11981,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11985,6 +11989,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -11992,6 +11997,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
index a868022..22b0aae 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -11992,6 +11995,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -11999,6 +12003,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -12006,6 +12011,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/pull_request.json b/recipes/engine_1_27_0.expected/pull_request.json
index 46daabf..e1e374b 100644
--- a/recipes/engine_1_27_0.expected/pull_request.json
+++ b/recipes/engine_1_27_0.expected/pull_request.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -15260,6 +15261,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
index 1d809e6..2530524 100644
--- a/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder.expected/Schedule two builds one with goma and one without.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -787,6 +788,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_builder_1_26_0.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder_1_26_0.expected/Schedule two builds one with goma and one without.json
index 1d809e6..2530524 100644
--- a/recipes/engine_builder_1_26_0.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder_1_26_0.expected/Schedule two builds one with goma and one without.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -787,6 +788,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/engine_builder_1_27_0.expected/Schedule two builds one with goma and one without.json b/recipes/engine_builder_1_27_0.expected/Schedule two builds one with goma and one without.json
index 1d809e6..2530524 100644
--- a/recipes/engine_builder_1_27_0.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine_builder_1_27_0.expected/Schedule two builds one with goma and one without.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -787,6 +788,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter.expected/validators.json b/recipes/flutter/flutter.expected/validators.json
index e52f266..eeff51e 100644
--- a/recipes/flutter/flutter.expected/validators.json
+++ b/recipes/flutter/flutter.expected/validators.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -157,6 +158,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.flutter doctor",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -183,6 +185,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.download dependencies",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -217,6 +220,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.dart analyze.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -416,6 +420,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.OS info",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/flutter/flutter.py b/recipes/flutter/flutter.py
index 8fdae16..19af793 100644
--- a/recipes/flutter/flutter.py
+++ b/recipes/flutter/flutter.py
@@ -66,8 +66,12 @@
   )
   with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
     with api.step.nest('prepare environment'), api.step.defer_results():
-      api.step('flutter doctor', ['flutter', 'doctor'])
-      api.step('download dependencies', ['flutter', 'update-packages'])
+      api.step('flutter doctor', ['flutter', 'doctor'], infra_step=True)
+      api.step(
+          'download dependencies',
+          ['flutter', 'update-packages'],
+          infra_step=True,
+      )
       api.adhoc_validation.run(
           api.properties.get('validation_name'),
           api.properties.get('validation'), env, env_prefixes,
diff --git a/recipes/flutter/flutter_1_26_0.expected/validators.json b/recipes/flutter/flutter_1_26_0.expected/validators.json
index e52f266..1cd0914 100644
--- a/recipes/flutter/flutter_1_26_0.expected/validators.json
+++ b/recipes/flutter/flutter_1_26_0.expected/validators.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -217,6 +218,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.dart analyze.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -416,6 +418,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.OS info",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/flutter/flutter_1_27_0.expected/validators.json b/recipes/flutter/flutter_1_27_0.expected/validators.json
index e52f266..1cd0914 100644
--- a/recipes/flutter/flutter_1_27_0.expected/validators.json
+++ b/recipes/flutter/flutter_1_27_0.expected/validators.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -217,6 +218,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.dart analyze.Set execute permission",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
@@ -416,6 +418,7 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "prepare environment.OS info",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk.json b/recipes/flutter/flutter_drone.expected/android_sdk.json
index 487bc1e..dc7f520 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -328,6 +329,7 @@
         "[CACHE]/android/tools"
       ]
     },
+    "infra_step": true,
     "name": "download dependencies"
   },
   {
@@ -360,6 +362,7 @@
         "[CACHE]/android/tools"
       ]
     },
+    "infra_step": true,
     "name": "flutter doctor"
   },
   {
@@ -614,6 +617,7 @@
         "[CACHE]/android/tools"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/no_requirements.json b/recipes/flutter/flutter_drone.expected/no_requirements.json
index 2758922..99d0518 100644
--- a/recipes/flutter/flutter_drone.expected/no_requirements.json
+++ b/recipes/flutter/flutter_drone.expected/no_requirements.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -144,6 +145,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "download dependencies"
   },
   {
@@ -170,6 +172,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "flutter doctor"
   },
   {
@@ -378,6 +381,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/web_engine.json b/recipes/flutter/flutter_drone.expected/web_engine.json
index ade9d28..5cbaf2d 100644
--- a/recipes/flutter/flutter_drone.expected/web_engine.json
+++ b/recipes/flutter/flutter_drone.expected/web_engine.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -144,6 +145,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "download dependencies"
   },
   {
@@ -291,6 +293,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "flutter doctor"
   },
   {
@@ -502,6 +505,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/xcode.json b/recipes/flutter/flutter_drone.expected/xcode.json
index 2758922..99d0518 100644
--- a/recipes/flutter/flutter_drone.expected/xcode.json
+++ b/recipes/flutter/flutter_drone.expected/xcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -144,6 +145,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "download dependencies"
   },
   {
@@ -170,6 +172,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "flutter doctor"
   },
   {
@@ -378,6 +381,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone.py b/recipes/flutter/flutter_drone.py
index adf4551..dae3cc2 100644
--- a/recipes/flutter/flutter_drone.py
+++ b/recipes/flutter/flutter_drone.py
@@ -60,7 +60,11 @@
   env['SUBSHARD'] = api.properties.get('subshard')
 
   with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
-    api.step('download dependencies', ['flutter', 'update-packages'])
+    api.step(
+        'download dependencies',
+        ['flutter', 'update-packages'],
+        infra_step=True,
+    )
     # Load local engine information if available.
     api.flutter_deps.flutter_engine(env, env_prefixes)
     dep_list = [d['dependency'] for d in deps]
@@ -69,7 +73,11 @@
         api.flutter_deps.gems(
             env, env_prefixes, checkout_path.join('dev', 'ci', 'mac')
         )
-        api.step('flutter doctor', ['flutter', 'doctor', '-v'])
+        api.step(
+            'flutter doctor',
+            ['flutter', 'doctor', '-v'],
+            infra_step=True,
+        )
         RunShard(api, env, env_prefixes, checkout_path)
         # This is to clean up leaked processes.
         api.os_utils.kill_processes()
@@ -77,7 +85,11 @@
         api.os_utils.collect_os_info()
     else:
       with api.step.defer_results():
-        api.step('flutter doctor', ['flutter', 'doctor', '-v'])
+        api.step(
+            'flutter doctor',
+            ['flutter', 'doctor', '-v'],
+            infra_step=True,
+        )
         RunShard(api, env, env_prefixes, checkout_path)
         # This is to clean up leaked processes.
         api.os_utils.kill_processes()
diff --git a/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json b/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
index 42cbb5f..8e41150 100644
--- a/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -610,6 +611,7 @@
         "[CACHE]/android/tools"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_26_0.expected/no_requirements.json b/recipes/flutter/flutter_drone_1_26_0.expected/no_requirements.json
index 184d4e2..ea42545 100644
--- a/recipes/flutter/flutter_drone_1_26_0.expected/no_requirements.json
+++ b/recipes/flutter/flutter_drone_1_26_0.expected/no_requirements.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -376,6 +377,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_26_0.expected/web_engine.json b/recipes/flutter/flutter_drone_1_26_0.expected/web_engine.json
index c373f7c..d2fc0d6 100644
--- a/recipes/flutter/flutter_drone_1_26_0.expected/web_engine.json
+++ b/recipes/flutter/flutter_drone_1_26_0.expected/web_engine.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -464,6 +465,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_26_0.expected/xcode.json b/recipes/flutter/flutter_drone_1_26_0.expected/xcode.json
index 184d4e2..ea42545 100644
--- a/recipes/flutter/flutter_drone_1_26_0.expected/xcode.json
+++ b/recipes/flutter/flutter_drone_1_26_0.expected/xcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -376,6 +377,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_27_0.expected/android_sdk.json b/recipes/flutter/flutter_drone_1_27_0.expected/android_sdk.json
index 42cbb5f..8e41150 100644
--- a/recipes/flutter/flutter_drone_1_27_0.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone_1_27_0.expected/android_sdk.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -610,6 +611,7 @@
         "[CACHE]/android/tools"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_27_0.expected/no_requirements.json b/recipes/flutter/flutter_drone_1_27_0.expected/no_requirements.json
index 184d4e2..ea42545 100644
--- a/recipes/flutter/flutter_drone_1_27_0.expected/no_requirements.json
+++ b/recipes/flutter/flutter_drone_1_27_0.expected/no_requirements.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -376,6 +377,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_27_0.expected/web_engine.json b/recipes/flutter/flutter_drone_1_27_0.expected/web_engine.json
index c373f7c..d2fc0d6 100644
--- a/recipes/flutter/flutter_drone_1_27_0.expected/web_engine.json
+++ b/recipes/flutter/flutter_drone_1_27_0.expected/web_engine.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -464,6 +465,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/flutter/flutter_drone_1_27_0.expected/xcode.json b/recipes/flutter/flutter_drone_1_27_0.expected/xcode.json
index 184d4e2..ea42545 100644
--- a/recipes/flutter/flutter_drone_1_27_0.expected/xcode.json
+++ b/recipes/flutter/flutter_drone_1_27_0.expected/xcode.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -376,6 +377,7 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine.expected/linux-post-submit.json b/recipes/web_engine.expected/linux-post-submit.json
index 968a7e6..31319bd 100644
--- a/recipes/web_engine.expected/linux-post-submit.json
+++ b/recipes/web_engine.expected/linux-post-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1505,6 +1506,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine.expected/linux-pre-submit.json b/recipes/web_engine.expected/linux-pre-submit.json
index a4af387..ce30e15 100644
--- a/recipes/web_engine.expected/linux-pre-submit.json
+++ b/recipes/web_engine.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1520,6 +1521,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine.expected/mac-post-submit.json b/recipes/web_engine.expected/mac-post-submit.json
index d92b79e..faa500e 100644
--- a/recipes/web_engine.expected/mac-post-submit.json
+++ b/recipes/web_engine.expected/mac-post-submit.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -1428,6 +1431,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -1455,6 +1459,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -1482,6 +1487,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/web_engine_1_26_0.expected/linux-post-submit.json b/recipes/web_engine_1_26_0.expected/linux-post-submit.json
index 968a7e6..31319bd 100644
--- a/recipes/web_engine_1_26_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_1_26_0.expected/linux-post-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1505,6 +1506,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine_1_26_0.expected/linux-pre-submit.json b/recipes/web_engine_1_26_0.expected/linux-pre-submit.json
index a4af387..ce30e15 100644
--- a/recipes/web_engine_1_26_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_1_26_0.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1520,6 +1521,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine_1_26_0.expected/mac-post-submit.json b/recipes/web_engine_1_26_0.expected/mac-post-submit.json
index d92b79e..faa500e 100644
--- a/recipes/web_engine_1_26_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_1_26_0.expected/mac-post-submit.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -1428,6 +1431,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -1455,6 +1459,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -1482,6 +1487,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {
diff --git a/recipes/web_engine_1_27_0.expected/linux-post-submit.json b/recipes/web_engine_1_27_0.expected/linux-post-submit.json
index 968a7e6..31319bd 100644
--- a/recipes/web_engine_1_27_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_1_27_0.expected/linux-post-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1505,6 +1506,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine_1_27_0.expected/linux-pre-submit.json b/recipes/web_engine_1_27_0.expected/linux-pre-submit.json
index a4af387..ce30e15 100644
--- a/recipes/web_engine_1_27_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_1_27_0.expected/linux-pre-submit.json
@@ -8,6 +8,7 @@
       "-o",
       "%MEM"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -1520,6 +1521,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
diff --git a/recipes/web_engine_1_27_0.expected/mac-post-submit.json b/recipes/web_engine_1_27_0.expected/mac-post-submit.json
index d92b79e..faa500e 100644
--- a/recipes/web_engine_1_27_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_1_27_0.expected/mac-post-submit.json
@@ -7,6 +7,7 @@
       "-o",
       "mem"
     ],
+    "infra_step": true,
     "name": "OS info"
   },
   {
@@ -14,6 +15,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/python"
     ],
+    "infra_step": true,
     "name": "python xattr info"
   },
   {
@@ -21,6 +23,7 @@
       "xattr",
       "/opt/s/w/ir/cipd_bin_packages/git"
     ],
+    "infra_step": true,
     "name": "git xattr info"
   },
   {
@@ -1428,6 +1431,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "OS info (2)"
   },
   {
@@ -1455,6 +1459,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "python xattr info (2)"
   },
   {
@@ -1482,6 +1487,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "git xattr info (2)"
   },
   {