Revert "[goma] remove --is-luci flag"

This reverts commit 09dbcd9e5a6d083efe55e51c07f7ef14053533bf.

Reason for revert:
culprit for http://b/169274108

Original change's description:
> [goma] remove --is-luci flag
>
> This is now always True.
>
> This also changes the behavior of script used by goma recipe modules.
>
> Bug: 1128847
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: chrome_release
> Change-Id: I07f8a75f05877f70b94f612acf5b046a6c0b0529
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2413708
> Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Auto-Submit: Takuto Ikuta <tikuta@chromium.org>

Bug: 1128847, b/169274108
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: chrome_release
Change-Id: I4cc7bb7974edb28aeff7d7d9fe145bb2e0e06c9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2425926
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@google.com>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
diff --git a/recipes/goma_utils.py b/recipes/goma_utils.py
index 8784231..80b413b 100644
--- a/recipes/goma_utils.py
+++ b/recipes/goma_utils.py
@@ -177,6 +177,7 @@
     master='unknown',
     slave='unknown',
     builder_id=None,
+    is_luci=False,
     is_experimental=False
 ):
   """Upload compiler_proxy{,-subproc}.INFO and gomacc.INFO to Google Storage.
@@ -187,6 +188,7 @@
     master: a string name of a master.
     slave: a string name of a slave.
     builder_id: a dictionary that represents BuilderID.
+    is_luci: True if this is LUCI.
     is_experimental: True if this is experimental build.
   """
   latest_subproc_info = GetLatestGomaCompilerProxySubprocInfo()
@@ -196,6 +198,7 @@
       'master': master,
       'slave': slave,
       'os': chromium_utils.PlatformName(),
+      'is_luci': is_luci,
       'is_experimental': is_experimental,
   }
   if builder_id:
@@ -361,6 +364,7 @@
     master='unknown',
     slave='unknown',
     builder_id=None,
+    is_luci=False
 ):
   """Make Goma exit status counter. This counter indicates compiler_proxy
      has finished without problem, crashed, or killed. This counter will
@@ -373,6 +377,7 @@
     master: master name
     slave: slave name
     builder_id: a dictionary that represents BuilderID.
+    is_luci: True if this is LUCI.
   """
 
   try:
@@ -381,8 +386,15 @@
         'value': 1,
         'os': chromium_utils.PlatformName(),
     }
-    SetBuilderIDToCounter(builder_id, counter)
-
+    if is_luci:
+      counter['name'] = '%s_luci' % counter['name']
+      SetBuilderIDToCounter(builder_id, counter)
+    else:
+      counter.update({
+          'builder': builder,
+          'master': master,
+          'slave': slave,
+      })
     if goma_stats_file and os.path.exists(goma_stats_file):
       counter['status'] = 'success'
     elif goma_crash_report and os.path.exists(goma_crash_report):
@@ -484,6 +496,7 @@
     master='unknown',
     slave='unknown',
     builder_id=None,
+    is_luci=False
 ):
   """Make latest Goma status counter which will be sent to ts_mon.
 
@@ -494,6 +507,7 @@
     master: master name
     slave: slave name
     builder_id: a dictionary that represents BuilderID.
+    is_luci: True if this is LUCI.
 
   Returns:
     counter dict if succeeded. None if failed.
@@ -540,7 +554,15 @@
         'os': chromium_utils.PlatformName(),
         'ping_status_code': ping_status_code, 'result': result
     }
-    SetBuilderIDToCounter(builder_id, counter)
+    if is_luci:
+      counter['name'] = '%s_luci' % counter['name']
+      SetBuilderIDToCounter(builder_id, counter)
+    else:
+      counter.update({
+          'builder': builder,
+          'master': master,
+          'slave': slave,
+      })
     start_time = GetCompilerProxyStartTime()
     if start_time:
       counter['start_time'] = int(time.mktime(start_time.timetuple()))
@@ -561,6 +583,7 @@
     master='unknown',
     slave='unknown',
     builder_id=None,
+    is_luci=False
 ):
   """Make latest Goma failure reason counter which will be sent to ts_mon.
 
@@ -571,6 +594,7 @@
     master: master name
     slave: slave name
     builder_id: a dictionary that represents BuilderID.
+    is_luci: True if this is LUCI.
 
   Returns:
     counter dict if succeeded. None if failed.
@@ -619,8 +643,15 @@
         'os': chromium_utils.PlatformName(), 'result': result,
         'exception_reason': reason
     }
-    SetBuilderIDToCounter(builder_id, counter)
-
+    if is_luci:
+      counter['name'] = '%s_luci' % counter['name']
+      SetBuilderIDToCounter(builder_id, counter)
+    else:
+      counter.update({
+          'builder': builder,
+          'master': master,
+          'slave': slave,
+      })
     start_time = GetCompilerProxyStartTime()
     if start_time:
       counter['start_time'] = int(time.mktime(start_time.timetuple()))
diff --git a/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/normal_build.json b/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/normal_build.json
index b57d77c..e22d1ed 100644
--- a/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/normal_build.json
+++ b/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/normal_build.json
@@ -920,6 +920,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_binary_size\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_binary_size",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/unexpected_increase.json b/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/unexpected_increase.json
index 3515ddd..c27a1aa 100644
--- a/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/unexpected_increase.json
+++ b/recipes/recipe_modules/binary_size/tests/android_binary_size.expected/unexpected_increase.json
@@ -920,6 +920,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_binary_size\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_binary_size",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_no_out_dir_with_goma_module.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_no_out_dir_with_goma_module.json
index 56d4e5d..185a1f4 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_no_out_dir_with_goma_module.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_no_out_dir_with_goma_module.json
@@ -634,6 +634,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_build_failure.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_build_failure.json
index f165848..8d947fc 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_build_failure.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_build_failure.json
@@ -633,6 +633,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_ping_failure.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_ping_failure.json
index bbf2754..725ed73 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_ping_failure.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_ping_failure.json
@@ -517,6 +517,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_start_failure.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_start_failure.json
index 2510806..d982f56 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_start_failure.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_goma_module_start_failure.json
@@ -515,6 +515,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_ninja_no_op_failure.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_ninja_no_op_failure.json
index d6621ac..7bbf581 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_ninja_no_op_failure.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_ninja_no_op_failure.json
@@ -638,6 +638,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_with_goma_module.json b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_with_goma_module.json
index 185ad5f..52e2cdd 100644
--- a/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_with_goma_module.json
+++ b/recipes/recipe_modules/chromium/examples/full.expected/basic_out_dir_with_goma_module.json
@@ -634,6 +634,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android arm Builder (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android arm Builder (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/basic.json b/recipes/recipe_modules/chromium/tests/compile.expected/basic.json
index eacdf49..d0144b5 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/basic.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/basic.json
@@ -363,6 +363,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/chromeos.json b/recipes/recipe_modules/chromium/tests/compile.expected/chromeos.json
index 55c52f7..c01335b 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/chromeos.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/chromeos.json
@@ -347,6 +347,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/codesearch.json b/recipes/recipe_modules/chromium/tests/compile.expected/codesearch.json
index 23809f2..5e8ff1b 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/codesearch.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/codesearch.json
@@ -351,6 +351,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/goma_canary.json b/recipes/recipe_modules/chromium/tests/compile.expected/goma_canary.json
index 367e804..ef51460 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/goma_canary.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/goma_canary.json
@@ -351,6 +351,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/goma_client_candidate.json b/recipes/recipe_modules/chromium/tests/compile.expected/goma_client_candidate.json
index 55c52f7..c01335b 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/goma_client_candidate.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/goma_client_candidate.json
@@ -347,6 +347,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/goma_custom_jobs_debug.json b/recipes/recipe_modules/chromium/tests/compile.expected/goma_custom_jobs_debug.json
index 3cdd389..7be4042 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/goma_custom_jobs_debug.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/goma_custom_jobs_debug.json
@@ -349,6 +349,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/goma_localoutputcache_small.json b/recipes/recipe_modules/chromium/tests/compile.expected/goma_localoutputcache_small.json
index 9ba203e..0444289 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/goma_localoutputcache_small.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/goma_localoutputcache_small.json
@@ -355,6 +355,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium/tests/compile.expected/official_win_luci.json b/recipes/recipe_modules/chromium/tests/compile.expected/official_win_luci.json
index 1dd5675..aabef7a 100644
--- a/recipes/recipe_modules/chromium/tests/compile.expected/official_win_luci.json
+++ b/recipes/recipe_modules/chromium/tests/compile.expected/official_win_luci.json
@@ -353,6 +353,7 @@
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
       "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
+      "--is-luci",
       "--buildbot-slavename",
       "fake-bot-id"
     ],
diff --git a/recipes/recipe_modules/chromium_android/examples/full.expected/basic_builder_basic.json b/recipes/recipe_modules/chromium_android/examples/full.expected/basic_builder_basic.json
index 6cc86d9..534afc6 100644
--- a/recipes/recipe_modules/chromium_android/examples/full.expected/basic_builder_basic.json
+++ b/recipes/recipe_modules/chromium_android/examples/full.expected/basic_builder_basic.json
@@ -613,6 +613,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"basic_builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "basic_builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_android/examples/full.expected/coverage_builder_basic.json b/recipes/recipe_modules/chromium_android/examples/full.expected/coverage_builder_basic.json
index 1b4ed6a..a3df7d5 100644
--- a/recipes/recipe_modules/chromium_android/examples/full.expected/coverage_builder_basic.json
+++ b/recipes/recipe_modules/chromium_android/examples/full.expected/coverage_builder_basic.json
@@ -613,6 +613,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"coverage_builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "coverage_builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_refs.json b/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_refs.json
index b743b7e..16fc483 100644
--- a/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_refs.json
+++ b/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_refs.json
@@ -611,6 +611,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"gerrit_try_builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "gerrit_try_builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_try_builder_basic.json b/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_try_builder_basic.json
index e3f2db7..2c98da0 100644
--- a/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_try_builder_basic.json
+++ b/recipes/recipe_modules/chromium_android/examples/full.expected/gerrit_try_builder_basic.json
@@ -613,6 +613,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"gerrit_try_builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "gerrit_try_builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android.json b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android.json
index 85f624a..bfcf73a 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android.json
@@ -722,6 +722,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android-cronet-arm-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-cronet-arm-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android_version.json b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android_version.json
index 60e1d1e..feca3f5 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android_version.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/android_version.json
@@ -735,6 +735,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Test Version\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Test Version",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure.json b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure.json
index bcfa508..c13d73d 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure.json
@@ -679,6 +679,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Tests\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Tests",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure_tryserver.json b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure_tryserver.json
index 94f34a1..1453b45 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure_tryserver.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/failure_tryserver.json
@@ -726,6 +726,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/linux_tests.json b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/linux_tests.json
index d7491d6..0efe256 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/linux_tests.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/compile_specific_targets.expected/linux_tests.json
@@ -679,6 +679,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Tests\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Tests",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/main_waterfall_steps.expected/builder.json b/recipes/recipe_modules/chromium_tests/tests/api/main_waterfall_steps.expected/builder.json
index a4f5545..eec971b 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/main_waterfall_steps.expected/builder.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/main_waterfall_steps.expected/builder.json
@@ -690,6 +690,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps.expected/basic.json b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps.expected/basic.json
index fd3335b..7c09a9f 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps.expected/basic.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps.expected/basic.json
@@ -875,6 +875,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_for_tests.expected/basic.json b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_for_tests.expected/basic.json
index ea9b10d..89edcc7 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_for_tests.expected/basic.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_for_tests.expected/basic.json
@@ -875,6 +875,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
index 89a11d49..34d2297 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
+++ b/recipes/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
@@ -1331,6 +1331,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_basic.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_basic.json
index 91f6ed8..1ab58c0 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_basic.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_basic.json
@@ -674,6 +674,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_experimental.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_experimental.json
index 7c2b4db..4485d78 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_experimental.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_experimental.json
@@ -674,6 +674,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_with_patch.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_with_patch.json
index 870158a..1e2c32f 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_with_patch.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_linux_test_with_patch.json
@@ -721,6 +721,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_delete_generated_files_fail.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_delete_generated_files_fail.json
index 82f145e..dfb86a1 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_delete_generated_files_fail.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_delete_generated_files_fail.json
@@ -681,6 +681,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_basic.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_basic.json
index 8d5bd42..f296b3c 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_basic.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_basic.json
@@ -677,6 +677,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_experimental.json b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_experimental.json
index 9837a74..570318e 100644
--- a/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_experimental.json
+++ b/recipes/recipe_modules/codesearch/examples/full.expected/codesearch_gen_chromium_win_test_experimental.json
@@ -677,6 +677,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/gn_test.json b/recipes/recipe_modules/cronet/examples/full.expected/gn_test.json
index b76e7c7..618dd99 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/gn_test.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/gn_test.json
@@ -626,6 +626,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"gn_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "gn_test",
       "--buildbot-mastername",
@@ -1184,6 +1185,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"gn_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "gn_test",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/gn_test_experimental.json b/recipes/recipe_modules/cronet/examples/full.expected/gn_test_experimental.json
index d62938b..08adb71 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/gn_test_experimental.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/gn_test_experimental.json
@@ -626,6 +626,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"gn_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "gn_test",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/local_test.json b/recipes/recipe_modules/cronet/examples/full.expected/local_test.json
index 0d704f3..9babaa9 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/local_test.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/local_test.json
@@ -915,6 +915,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"local_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "local_test",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/mb_test.json b/recipes/recipe_modules/cronet/examples/full.expected/mb_test.json
index 07f3ba2..8341e25 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/mb_test.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/mb_test.json
@@ -669,6 +669,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mb_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mb_test",
       "--buildbot-mastername",
@@ -1347,6 +1348,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mb_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mb_test",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/mb_test_experimental.json b/recipes/recipe_modules/cronet/examples/full.expected/mb_test_experimental.json
index 443ea61..7eba585 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/mb_test_experimental.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/mb_test_experimental.json
@@ -669,6 +669,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mb_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "mb_test",
diff --git a/recipes/recipe_modules/cronet/examples/full.expected/optional_properties.json b/recipes/recipe_modules/cronet/examples/full.expected/optional_properties.json
index f39cf6a..ed372eb 100644
--- a/recipes/recipe_modules/cronet/examples/full.expected/optional_properties.json
+++ b/recipes/recipe_modules/cronet/examples/full.expected/optional_properties.json
@@ -915,6 +915,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"local_test\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "local_test",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/api.py b/recipes/recipe_modules/goma/api.py
index dbbfbf6..560d557 100644
--- a/recipes/recipe_modules/goma/api.py
+++ b/recipes/recipe_modules/goma/api.py
@@ -596,6 +596,8 @@
             'builder': builder_id.builder,
         })
     ])
+    args.append('--is-luci')
+
     if self.m.runtime.is_experimental:
       args.append('--is-experimental')
 
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux.json b/recipes/recipe_modules/goma/examples/full.expected/linux.json
index c597d51..5f30921 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux.json
@@ -277,6 +277,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_compile_failed.json b/recipes/recipe_modules/goma/examples/full.expected/linux_compile_failed.json
index 97d4ff8..98db6d2 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_compile_failed.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_compile_failed.json
@@ -280,6 +280,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_custom_jobs.json b/recipes/recipe_modules/goma/examples/full.expected/linux_custom_jobs.json
index c597d51..5f30921 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_custom_jobs.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_custom_jobs.json
@@ -277,6 +277,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_debug.json b/recipes/recipe_modules/goma/examples/full.expected/linux_debug.json
index 93197c0..c5d60ab 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_debug.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_debug.json
@@ -280,6 +280,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_invalid_goma_jsonstatus.json b/recipes/recipe_modules/goma/examples/full.expected/linux_invalid_goma_jsonstatus.json
index 3778282..45319a8 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_invalid_goma_jsonstatus.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_invalid_goma_jsonstatus.json
@@ -272,6 +272,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_local_run_goma_recipe.json b/recipes/recipe_modules/goma/examples/full.expected/linux_local_run_goma_recipe.json
index ccda4e2..1d5e3a4 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_local_run_goma_recipe.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_local_run_goma_recipe.json
@@ -184,6 +184,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_set_custome_tmp_dir.json b/recipes/recipe_modules/goma/examples/full.expected/linux_set_custome_tmp_dir.json
index 4dca34c..7cc74b2 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_set_custome_tmp_dir.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_set_custome_tmp_dir.json
@@ -281,6 +281,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_start_goma_failed.json b/recipes/recipe_modules/goma/examples/full.expected/linux_start_goma_failed.json
index a05af13..cc4dea0 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_start_goma_failed.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_start_goma_failed.json
@@ -206,6 +206,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/linux_stop_goma_failed.json b/recipes/recipe_modules/goma/examples/full.expected/linux_stop_goma_failed.json
index 26f2c25..9d75e85 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/linux_stop_goma_failed.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/linux_stop_goma_failed.json
@@ -281,6 +281,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/mac.json b/recipes/recipe_modules/goma/examples/full.expected/mac.json
index c597d51..5f30921 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/mac.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/mac.json
@@ -277,6 +277,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/win.json b/recipes/recipe_modules/goma/examples/full.expected/win.json
index c7204ea..32448ca 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/win.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/win.json
@@ -277,6 +277,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/win_goma_canary.json b/recipes/recipe_modules/goma/examples/full.expected/win_goma_canary.json
index 90695ab..339ea81 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/win_goma_canary.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/win_goma_canary.json
@@ -281,6 +281,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/examples/full.expected/win_goma_latest_client.json b/recipes/recipe_modules/goma/examples/full.expected/win_goma_latest_client.json
index 5657764..7fc8aa6 100644
--- a/recipes/recipe_modules/goma/examples/full.expected/win_goma_latest_client.json
+++ b/recipes/recipe_modules/goma/examples/full.expected/win_goma_latest_client.json
@@ -285,6 +285,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipe_modules/goma/tests/build_with_goma.expected/basic.json b/recipes/recipe_modules/goma/tests/build_with_goma.expected/basic.json
index 8801465..525d667 100644
--- a/recipes/recipe_modules/goma/tests/build_with_goma.expected/basic.json
+++ b/recipes/recipe_modules/goma/tests/build_with_goma.expected/basic.json
@@ -260,6 +260,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipe_modules/goma/tests/build_with_goma.expected/enable_ats.json b/recipes/recipe_modules/goma/tests/build_with_goma.expected/enable_ats.json
index 5f57cd3..fcb1b41 100644
--- a/recipes/recipe_modules/goma/tests/build_with_goma.expected/enable_ats.json
+++ b/recipes/recipe_modules/goma/tests/build_with_goma.expected/enable_ats.json
@@ -264,6 +264,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipe_modules/goma/tests/build_with_goma.expected/server_host.json b/recipes/recipe_modules/goma/tests/build_with_goma.expected/server_host.json
index 12ac2e7..df81006 100644
--- a/recipes/recipe_modules/goma/tests/build_with_goma.expected/server_host.json
+++ b/recipes/recipe_modules/goma/tests/build_with_goma.expected/server_host.json
@@ -268,6 +268,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipe_modules/goma/tests/start.expected/basic.json b/recipes/recipe_modules/goma/tests/start.expected/basic.json
index c4f0f35..8994cba 100644
--- a/recipes/recipe_modules/goma/tests/start.expected/basic.json
+++ b/recipes/recipe_modules/goma/tests/start.expected/basic.json
@@ -254,6 +254,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"test_buildername\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "test_buildername",
       "--buildbot-slavename",
diff --git a/recipes/recipe_modules/goma/tests/start.expected/luci_and_experimental.json b/recipes/recipe_modules/goma/tests/start.expected/luci_and_experimental.json
index a716201..b1deea6 100644
--- a/recipes/recipe_modules/goma/tests/start.expected/luci_and_experimental.json
+++ b/recipes/recipe_modules/goma/tests/start.expected/luci_and_experimental.json
@@ -254,6 +254,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"test_buildername\", \"project\": \"project\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "test_buildername",
diff --git a/recipes/recipe_modules/ios/examples/full.expected/basic.json b/recipes/recipe_modules/ios/examples/full.expected/basic.json
index 3784e102..d12f73c 100644
--- a/recipes/recipe_modules/ios/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/ios/examples/full.expected/basic.json
@@ -807,6 +807,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"ios\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/angle.expected/linux.json b/recipes/recipes/angle.expected/linux.json
index ff31601..09f3922 100644
--- a/recipes/recipes/angle.expected/linux.json
+++ b/recipes/recipes/angle.expected/linux.json
@@ -385,6 +385,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"angle\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/angle.expected/win.json b/recipes/recipes/angle.expected/win.json
index e01923b..878e8a2 100644
--- a/recipes/recipes/angle.expected/win.json
+++ b/recipes/recipes/angle.expected/win.json
@@ -414,6 +414,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows\", \"project\": \"angle\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows",
       "--buildbot-mastername",
diff --git a/recipes/recipes/angle.expected/win_clang.json b/recipes/recipes/angle.expected/win_clang.json
index 50b60dc..a76ffb9 100644
--- a/recipes/recipes/angle.expected/win_clang.json
+++ b/recipes/recipes/angle.expected/win_clang.json
@@ -414,6 +414,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows\", \"project\": \"angle\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows",
       "--buildbot-mastername",
diff --git a/recipes/recipes/celab.expected/chrome_try.json b/recipes/recipes/celab.expected/chrome_try.json
index ac3c9b5..e6e7894 100644
--- a/recipes/recipes/celab.expected/chrome_try.json
+++ b/recipes/recipes/celab.expected/chrome_try.json
@@ -732,6 +732,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"luci.chrome.try\", \"builder\": \"win-celab-try-rel\", \"project\": \"chrome\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win-celab-try-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/celab.expected/chromium_no_celab_package.json b/recipes/recipes/celab.expected/chromium_no_celab_package.json
index e8c91eb..bed3051 100644
--- a/recipes/recipes/celab.expected/chromium_no_celab_package.json
+++ b/recipes/recipes/celab.expected/chromium_no_celab_package.json
@@ -718,6 +718,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"luci.chromium.try\", \"builder\": \"win-celab-try-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win-celab-try-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/celab.expected/chromium_try.json b/recipes/recipes/celab.expected/chromium_try.json
index f22ff10..46ea2aa 100644
--- a/recipes/recipes/celab.expected/chromium_try.json
+++ b/recipes/recipes/celab.expected/chromium_try.json
@@ -718,6 +718,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"luci.chromium.try\", \"builder\": \"win-celab-try-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win-celab-try-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test.json b/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test.json
index 1803198..c4eb953 100644
--- a/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test.json
+++ b/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test.json
@@ -744,6 +744,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test_compile_target_overriden.json b/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test_compile_target_overriden.json
index 60b7d71..3b5ece9 100644
--- a/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test_compile_target_overriden.json
+++ b/recipes/recipes/chromium.expected/build_dynamic_isolated_script_test_compile_target_overriden.json
@@ -750,6 +750,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test.json b/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test.json
index 18ec3dc..587c2e7 100644
--- a/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test.json
+++ b/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test.json
@@ -747,6 +747,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test_compile_target_overidden.json b/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test_compile_target_overidden.json
index 8f3ec0e..c071571 100644
--- a/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test_compile_target_overidden.json
+++ b/recipes/recipes/chromium.expected/build_dynamic_swarmed_isolated_script_test_compile_target_overidden.json
@@ -753,6 +753,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_gtest_fuchsia.json b/recipes/recipes/chromium.expected/dynamic_gtest_fuchsia.json
index 9d50668..fefcc2a 100644
--- a/recipes/recipes/chromium.expected/dynamic_gtest_fuchsia.json
+++ b/recipes/recipes/chromium.expected/dynamic_gtest_fuchsia.json
@@ -723,6 +723,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"fuchsia-fyi-x64-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "fuchsia-fyi-x64-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_gtest_memory_builder.json b/recipes/recipes/chromium.expected/dynamic_gtest_memory_builder.json
index b7bae54..98f1572 100644
--- a/recipes/recipes/chromium.expected/dynamic_gtest_memory_builder.json
+++ b/recipes/recipes/chromium.expected/dynamic_gtest_memory_builder.json
@@ -750,6 +750,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux ASan LSan Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux ASan LSan Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_gtest_on_builder.json b/recipes/recipes/chromium.expected/dynamic_gtest_on_builder.json
index b603402..03df53a 100644
--- a/recipes/recipes/chromium.expected/dynamic_gtest_on_builder.json
+++ b/recipes/recipes/chromium.expected/dynamic_gtest_on_builder.json
@@ -730,6 +730,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_junit_test.json b/recipes/recipes/chromium.expected/dynamic_junit_test.json
index dfb2aa6..4ced3de 100644
--- a/recipes/recipes/chromium.expected/dynamic_junit_test.json
+++ b/recipes/recipes/chromium.expected/dynamic_junit_test.json
@@ -774,6 +774,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android-marshmallow-arm64-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-marshmallow-arm64-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_swarmed_gtest.json b/recipes/recipes/chromium.expected/dynamic_swarmed_gtest.json
index bca619d..a62e9bd 100644
--- a/recipes/recipes/chromium.expected/dynamic_swarmed_gtest.json
+++ b/recipes/recipes/chromium.expected/dynamic_swarmed_gtest.json
@@ -749,6 +749,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium.expected/dynamic_swarmed_gtest_override_compile_targets.json b/recipes/recipes/chromium.expected/dynamic_swarmed_gtest_override_compile_targets.json
index 6cf5a42..71f53fb 100644
--- a/recipes/recipes/chromium.expected/dynamic_swarmed_gtest_override_compile_targets.json
+++ b/recipes/recipes/chromium.expected/dynamic_swarmed_gtest_override_compile_targets.json
@@ -749,6 +749,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_afl.expected/full_chromium_fuzz_Afl_Upload_Linux_ASan.json b/recipes/recipes/chromium_afl.expected/full_chromium_fuzz_Afl_Upload_Linux_ASan.json
index 2d30c65..912053e 100644
--- a/recipes/recipes/chromium_afl.expected/full_chromium_fuzz_Afl_Upload_Linux_ASan.json
+++ b/recipes/recipes/chromium_afl.expected/full_chromium_fuzz_Afl_Upload_Linux_ASan.json
@@ -667,6 +667,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Afl Upload Linux ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Afl Upload Linux ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android.json
index e6b6e45..cb42c4a 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android_with_revision.json
index 2cfd552..bcae127 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_android_with_revision.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos.json
index fd7beef..6b02f0c 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos.json
@@ -822,6 +822,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-chromiumos\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-chromiumos",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_translation_unit_fail.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_translation_unit_fail.json
index 65b4bc5..cae8bf0 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_translation_unit_fail.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_translation_unit_fail.json
@@ -822,6 +822,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-chromiumos\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-chromiumos",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_with_revision.json
index ddd2547..ae9aab0 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_chromiumos_with_revision.json
@@ -822,6 +822,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-chromiumos\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-chromiumos",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia.json
index 13fe0c0..d8a6472 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-fuchsia\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-fuchsia",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia_with_revision.json
index 3886262..ee73716 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_fuchsia_with_revision.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-fuchsia\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-fuchsia",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros.json
index f9419d9..a2738eb 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros.json
@@ -735,6 +735,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-lacros\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-lacros",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros_with_revision.json
index a2deef8..840f38c 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_lacros_with_revision.json
@@ -735,6 +735,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-lacros\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-lacros",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux.json
index 62f7835..faeb8d6 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_compile_fail.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_compile_fail.json
index bbcbbee..720a578 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_compile_fail.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_compile_fail.json
@@ -713,6 +713,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_sync_generated_files_fail.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_sync_generated_files_fail.json
index e697946..cde1e98 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_sync_generated_files_fail.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_sync_generated_files_fail.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_with_revision.json
index 332733d..2128669 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_linux_with_revision.json
@@ -733,6 +733,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win.json
index c808d1d..34450f9 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win.json
@@ -736,6 +736,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_delete_generated_files_fail.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_delete_generated_files_fail.json
index 51791ed..e9b1c3b 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_delete_generated_files_fail.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_delete_generated_files_fail.json
@@ -740,6 +740,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_git_config_fail.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_git_config_fail.json
index a9da7f9..f3c782b 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_git_config_fail.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_git_config_fail.json
@@ -736,6 +736,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_with_revision.json b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_with_revision.json
index bb39f0e..d3c0927 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_with_revision.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_codesearch_gen_chromium_win_with_revision.json
@@ -736,6 +736,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"codesearch-gen-chromium-win\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "codesearch-gen-chromium-win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_codesearch.expected/full_gen_linux_try_with_patch.json b/recipes/recipes/chromium_codesearch.expected/full_gen_linux_try_with_patch.json
index 17030bb..add5b07 100644
--- a/recipes/recipes/chromium_codesearch.expected/full_gen_linux_try_with_patch.json
+++ b/recipes/recipes/chromium_codesearch.expected/full_gen_linux_try_with_patch.json
@@ -781,6 +781,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"gen-linux-try\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "gen-linux-try",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_integration.expected/bug_introduced_by_chromium.json b/recipes/recipes/chromium_integration.expected/bug_introduced_by_chromium.json
index d6cc5e3..d72265a 100644
--- a/recipes/recipes/chromium_integration.expected/bug_introduced_by_chromium.json
+++ b/recipes/recipes/chromium_integration.expected/bug_introduced_by_chromium.json
@@ -743,6 +743,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
@@ -2050,6 +2051,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_integration.expected/bug_introduced_by_commit.json b/recipes/recipes/chromium_integration.expected/bug_introduced_by_commit.json
index 9d380ef..66cc6fe 100644
--- a/recipes/recipes/chromium_integration.expected/bug_introduced_by_commit.json
+++ b/recipes/recipes/chromium_integration.expected/bug_introduced_by_commit.json
@@ -743,6 +743,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
@@ -2050,6 +2051,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_integration.expected/flaky_test.json b/recipes/recipes/chromium_integration.expected/flaky_test.json
index 996919e..bb4a693 100644
--- a/recipes/recipes/chromium_integration.expected/flaky_test.json
+++ b/recipes/recipes/chromium_integration.expected/flaky_test.json
@@ -743,6 +743,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Builder\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Chrome_OS_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Chrome_OS_ASan.json
index e81f652..419256f 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Chrome_OS_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Chrome_OS_ASan.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Chrome OS ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Chrome OS ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan.json
index 15e58c7..04b4bde 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux32 ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux32 ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan_Debug.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan_Debug.json
index b0c4bb9..9f4d4c5 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan_Debug.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_ASan_Debug.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux32 ASan Debug\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux32 ASan Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan.json
index 0b1d4cd..26016cf 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan.json
@@ -693,6 +693,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux32 V8-ARM ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux32 V8-ARM ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan_Debug.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan_Debug.json
index 4b9f259..72bb648 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan_Debug.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux32_V8_ARM_ASan_Debug.json
@@ -693,6 +693,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux32 V8-ARM ASan Debug\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux32 V8-ARM ASan Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan.json
index cd15379..184f246 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan_Debug.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan_Debug.json
index e021cbf3..f8cb078 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan_Debug.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_ASan_Debug.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux ASan Debug\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux ASan Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_MSan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_MSan.json
index 266dd25..40e3f49 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_MSan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_MSan.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux MSan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux MSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_UBSan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_UBSan.json
index 18eb6d5..1c09537 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_UBSan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_UBSan.json
@@ -678,6 +678,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux UBSan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux UBSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan.json
index 7ae7b00..68a6e06 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan.json
@@ -693,6 +693,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux V8-ARM64 ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux V8-ARM64 ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan_Debug.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan_Debug.json
index b54d974..a36632e 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan_Debug.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Linux_V8_ARM64_ASan_Debug.json
@@ -693,6 +693,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Linux V8-ARM64 ASan Debug\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Linux V8-ARM64 ASan Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
index 0c19253..3fba1d9 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
@@ -723,6 +723,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Mac ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Mac ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Windows_ASan.json b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Windows_ASan.json
index 3a94245..fa49638 100644
--- a/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Windows_ASan.json
+++ b/recipes/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Windows_ASan.json
@@ -692,6 +692,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Libfuzzer Upload Windows ASan\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Libfuzzer Upload Windows ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json b/recipes/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
index c15c946..1de9423 100644
--- a/recipes/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
+++ b/recipes/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
@@ -607,6 +607,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"ClangToTLinuxASanLibfuzzer\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ClangToTLinuxASanLibfuzzer",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_libfuzzer_trybot.expected/basic_linux_tryjob_with_compile.json b/recipes/recipes/chromium_libfuzzer_trybot.expected/basic_linux_tryjob_with_compile.json
index dbe58fc..06c6916 100644
--- a/recipes/recipes/chromium_libfuzzer_trybot.expected/basic_linux_tryjob_with_compile.json
+++ b/recipes/recipes/chromium_libfuzzer_trybot.expected/basic_linux_tryjob_with_compile.json
@@ -872,6 +872,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-libfuzzer-asan-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-libfuzzer-asan-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/clobber_analyze.json b/recipes/recipes/chromium_trybot.expected/clobber_analyze.json
index ecd304e..e6b5519 100644
--- a/recipes/recipes/chromium_trybot.expected/clobber_analyze.json
+++ b/recipes/recipes/chromium_trybot.expected/clobber_analyze.json
@@ -881,6 +881,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_chromium_clobber_rel_ng\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_chromium_clobber_rel_ng",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/compile_failure_infra.json b/recipes/recipes/chromium_trybot.expected/compile_failure_infra.json
index 01d8287..5255265 100644
--- a/recipes/recipes/chromium_trybot.expected/compile_failure_infra.json
+++ b/recipes/recipes/chromium_trybot.expected/compile_failure_infra.json
@@ -898,6 +898,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/compile_failure_ng.json b/recipes/recipes/chromium_trybot.expected/compile_failure_ng.json
index 1b896f6..73253ab 100644
--- a/recipes/recipes/chromium_trybot.expected/compile_failure_ng.json
+++ b/recipes/recipes/chromium_trybot.expected/compile_failure_ng.json
@@ -913,6 +913,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/compile_failure_with_component_rev.json b/recipes/recipes/chromium_trybot.expected/compile_failure_with_component_rev.json
index 8fc6a90..5f24fb1 100644
--- a/recipes/recipes/chromium_trybot.expected/compile_failure_with_component_rev.json
+++ b/recipes/recipes/chromium_trybot.expected/compile_failure_with_component_rev.json
@@ -884,6 +884,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"v8_linux_chromium_gn_rel\", \"project\": \"v8\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "v8_linux_chromium_gn_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_deapply_fn.json b/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_deapply_fn.json
index 80b8a5b..7cb18a9 100644
--- a/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_deapply_fn.json
+++ b/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_deapply_fn.json
@@ -913,6 +913,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
@@ -1755,6 +1756,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_ng.json b/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_ng.json
index 1b896f6..73253ab 100644
--- a/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_ng.json
+++ b/recipes/recipes/chromium_trybot.expected/compile_failure_without_patch_ng.json
@@ -913,6 +913,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
index 2b7ef83..f28ce49 100644
--- a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
+++ b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
@@ -937,6 +937,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
@@ -2222,6 +2223,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
index c845742..728c39b 100644
--- a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
+++ b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
@@ -937,6 +937,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
index 08cdb79..0de6503 100644
--- a/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
+++ b/recipes/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
@@ -948,6 +948,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json b/recipes/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
index f781fa7..f5829d5 100644
--- a/recipes/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
+++ b/recipes/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
@@ -937,6 +937,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/invalid_results.json b/recipes/recipes/chromium_trybot.expected/invalid_results.json
index b01146c..31dfdc0 100644
--- a/recipes/recipes/chromium_trybot.expected/invalid_results.json
+++ b/recipes/recipes/chromium_trybot.expected/invalid_results.json
@@ -913,6 +913,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
@@ -1755,6 +1756,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/process_dumps_failure.json b/recipes/recipes/chromium_trybot.expected/process_dumps_failure.json
index 696be6b..3c3563a 100644
--- a/recipes/recipes/chromium_trybot.expected/process_dumps_failure.json
+++ b/recipes/recipes/chromium_trybot.expected/process_dumps_failure.json
@@ -903,6 +903,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win7-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win7-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json b/recipes/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
index 2e3de01..ec321c0 100644
--- a/recipes/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
+++ b/recipes/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
@@ -941,6 +941,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
@@ -2306,6 +2307,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json b/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
index 23c7df7..52e4cc2 100644
--- a/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
+++ b/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
@@ -941,6 +941,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json b/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
index 16a526e..ea7b61f 100644
--- a/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
+++ b/recipes/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
@@ -941,6 +941,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarming_test_failure.json b/recipes/recipes/chromium_trybot.expected/swarming_test_failure.json
index 6fd797a..2a5bb44 100644
--- a/recipes/recipes/chromium_trybot.expected/swarming_test_failure.json
+++ b/recipes/recipes/chromium_trybot.expected/swarming_test_failure.json
@@ -936,6 +936,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json b/recipes/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
index a462355..fc97602 100644
--- a/recipes/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
+++ b/recipes/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
@@ -938,6 +938,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/swarming_trigger_failure.json b/recipes/recipes/chromium_trybot.expected/swarming_trigger_failure.json
index 7e10b03..d72a3ce 100644
--- a/recipes/recipes/chromium_trybot.expected/swarming_trigger_failure.json
+++ b/recipes/recipes/chromium_trybot.expected/swarming_trigger_failure.json
@@ -936,6 +936,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot_compile_failure.json b/recipes/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot_compile_failure.json
index 1e989ca..b70c4f0 100644
--- a/recipes/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot_compile_failure.json
+++ b/recipes/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot_compile_failure.json
@@ -917,6 +917,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/cronet.expected/android_cronet_marshmallow_arm64_perf_rel.json b/recipes/recipes/cronet.expected/android_cronet_marshmallow_arm64_perf_rel.json
index 522355f..2efb6e3 100644
--- a/recipes/recipes/cronet.expected/android_cronet_marshmallow_arm64_perf_rel.json
+++ b/recipes/recipes/cronet.expected/android_cronet_marshmallow_arm64_perf_rel.json
@@ -669,6 +669,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android-cronet-marshmallow-arm64-perf-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-cronet-marshmallow-arm64-perf-rel",
       "--buildbot-mastername",
@@ -1133,6 +1134,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android-cronet-marshmallow-arm64-perf-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-cronet-marshmallow-arm64-perf-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/dawn.expected/linux.json b/recipes/recipes/dawn.expected/linux.json
index 1a0d5d1..1f7cebb 100644
--- a/recipes/recipes/dawn.expected/linux.json
+++ b/recipes/recipes/dawn.expected/linux.json
@@ -384,6 +384,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
@@ -711,6 +712,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/dawn.expected/linux_gcc.json b/recipes/recipes/dawn.expected/linux_gcc.json
index aed434b..ad02cd5 100644
--- a/recipes/recipes/dawn.expected/linux_gcc.json
+++ b/recipes/recipes/dawn.expected/linux_gcc.json
@@ -384,6 +384,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
@@ -711,6 +712,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/dawn.expected/mac.json b/recipes/recipes/dawn.expected/mac.json
index a701f7a..ca413a3 100644
--- a/recipes/recipes/dawn.expected/mac.json
+++ b/recipes/recipes/dawn.expected/mac.json
@@ -437,6 +437,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac",
       "--buildbot-slavename",
@@ -764,6 +765,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac",
       "--buildbot-slavename",
diff --git a/recipes/recipes/dawn.expected/win.json b/recipes/recipes/dawn.expected/win.json
index 3e5c5fa..697c94b 100644
--- a/recipes/recipes/dawn.expected/win.json
+++ b/recipes/recipes/dawn.expected/win.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
@@ -771,6 +772,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
diff --git a/recipes/recipes/dawn.expected/win_clang.json b/recipes/recipes/dawn.expected/win_clang.json
index 098996f..0882b3d 100644
--- a/recipes/recipes/dawn.expected/win_clang.json
+++ b/recipes/recipes/dawn.expected/win_clang.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
@@ -771,6 +772,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
diff --git a/recipes/recipes/dawn.expected/win_rel_msvc_x86.json b/recipes/recipes/dawn.expected/win_rel_msvc_x86.json
index 1474fef..dc2134d 100644
--- a/recipes/recipes/dawn.expected/win_rel_msvc_x86.json
+++ b/recipes/recipes/dawn.expected/win_rel_msvc_x86.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
@@ -771,6 +772,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"dawn\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-slavename",
diff --git a/recipes/recipes/devtools/devtools-backend.expected/basic try.json b/recipes/recipes/devtools/devtools-backend.expected/basic try.json
index 360348e..23c6847 100644
--- a/recipes/recipes/devtools/devtools-backend.expected/basic try.json
+++ b/recipes/recipes/devtools/devtools-backend.expected/basic try.json
@@ -600,6 +600,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"linux\", \"builder\": \"builder\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/basic debug.json b/recipes/recipes/devtools/devtools-frontend.expected/basic debug.json
index 56991df..79729d6 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/basic debug.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/basic debug.json
@@ -504,6 +504,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/basic no cov.json b/recipes/recipes/devtools/devtools-frontend.expected/basic no cov.json
index 111ed59..af8434c 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/basic no cov.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/basic no cov.json
@@ -491,6 +491,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/basic try.json b/recipes/recipes/devtools/devtools-frontend.expected/basic try.json
index 76032e1..a7846b9 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/basic try.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/basic try.json
@@ -537,6 +537,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/basic win.json b/recipes/recipes/devtools/devtools-frontend.expected/basic win.json
index dfec11f..a9af2b5 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/basic win.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/basic win.json
@@ -491,6 +491,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/basic with cov.json b/recipes/recipes/devtools/devtools-frontend.expected/basic with cov.json
index dd05fc6..bfc6013 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/basic with cov.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/basic with cov.json
@@ -491,6 +491,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/compile failure.json b/recipes/recipes/devtools/devtools-frontend.expected/compile failure.json
index 7a04541..9b5f1ed 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/compile failure.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/compile failure.json
@@ -487,6 +487,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/devtools/devtools-frontend.expected/experimental.json b/recipes/recipes/devtools/devtools-frontend.expected/experimental.json
index 76032e1..a7846b9 100644
--- a/recipes/recipes/devtools/devtools-frontend.expected/experimental.json
+++ b/recipes/recipes/devtools/devtools-frontend.expected/experimental.json
@@ -537,6 +537,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux\", \"project\": \"devtools\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/emscripten_releases.expected/linux.json b/recipes/recipes/emscripten_releases.expected/linux.json
index 73455d4..649fa3c 100644
--- a/recipes/recipes/emscripten_releases.expected/linux.json
+++ b/recipes/recipes/emscripten_releases.expected/linux.json
@@ -460,6 +460,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"emscripten-releases\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/emscripten_releases.expected/linux_buildfail.json b/recipes/recipes/emscripten_releases.expected/linux_buildfail.json
index 308dc38..3c0d64b 100644
--- a/recipes/recipes/emscripten_releases.expected/linux_buildfail.json
+++ b/recipes/recipes/emscripten_releases.expected/linux_buildfail.json
@@ -31,6 +31,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"emscripten-releases\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/emscripten_releases.expected/mac.json b/recipes/recipes/emscripten_releases.expected/mac.json
index 3ee73d69..f92f81e 100644
--- a/recipes/recipes/emscripten_releases.expected/mac.json
+++ b/recipes/recipes/emscripten_releases.expected/mac.json
@@ -513,6 +513,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"emscripten-releases\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/findit/chromium/compile.expected/check_suspected_revision_before_bisect.json b/recipes/recipes/findit/chromium/compile.expected/check_suspected_revision_before_bisect.json
index e63d856..b67fc8a 100644
--- a/recipes/recipes/findit/chromium/compile.expected/check_suspected_revision_before_bisect.json
+++ b/recipes/recipes/findit/chromium/compile.expected/check_suspected_revision_before_bisect.json
@@ -1085,6 +1085,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1902,6 +1903,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json b/recipes/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json
index 2a6cfd7..ee03095 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json
@@ -1414,6 +1414,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_default_targets.json b/recipes/recipes/findit/chromium/compile.expected/compile_default_targets.json
index 15cd26e..5eac238 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_default_targets.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_default_targets.json
@@ -1000,6 +1000,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_failed.json b/recipes/recipes/findit/chromium/compile.expected/compile_failed.json
index b3cf514..6799fcd 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_failed.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_failed.json
@@ -984,6 +984,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets.json b/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets.json
index d280ef7..179d89a 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets.json
@@ -1079,6 +1079,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets_from_parameter.json b/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets_from_parameter.json
index d280ef7..179d89a 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets_from_parameter.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_specified_targets_from_parameter.json
@@ -1079,6 +1079,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_succeeded.json b/recipes/recipes/findit/chromium/compile.expected/compile_succeeded.json
index 15cd26e..5eac238 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_succeeded.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_succeeded.json
@@ -1000,6 +1000,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/compile_succeeded_non_json_buildbucket.json b/recipes/recipes/findit/chromium/compile.expected/compile_succeeded_non_json_buildbucket.json
index 15cd26e..5eac238 100644
--- a/recipes/recipes/findit/chromium/compile.expected/compile_succeeded_non_json_buildbucket.json
+++ b/recipes/recipes/findit/chromium/compile.expected/compile_succeeded_non_json_buildbucket.json
@@ -1000,6 +1000,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_build_error.json b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_build_error.json
index 8d33a82..bb5a303 100644
--- a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_build_error.json
+++ b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_build_error.json
@@ -1077,6 +1077,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_ping_failure.json b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_ping_failure.json
index 4a8cb3e..56df22e 100644
--- a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_ping_failure.json
+++ b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_ping_failure.json
@@ -956,6 +956,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_setup_failure.json b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_setup_failure.json
index 1af14ab..591eb25 100644
--- a/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_setup_failure.json
+++ b/recipes/recipes/findit/chromium/compile.expected/failed_compile_upon_infra_failure_goma_setup_failure.json
@@ -954,6 +954,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/find_culprit_as_first_revision_of_entire_range.json b/recipes/recipes/findit/chromium/compile.expected/find_culprit_as_first_revision_of_entire_range.json
index bad38e2..604747e 100644
--- a/recipes/recipes/findit/chromium/compile.expected/find_culprit_as_first_revision_of_entire_range.json
+++ b/recipes/recipes/findit/chromium/compile.expected/find_culprit_as_first_revision_of_entire_range.json
@@ -1066,6 +1066,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1899,6 +1900,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/find_culprit_at_first_revision_of_a_sub_range.json b/recipes/recipes/findit/chromium/compile.expected/find_culprit_at_first_revision_of_a_sub_range.json
index 47c1188..9c13ca0 100644
--- a/recipes/recipes/findit/chromium/compile.expected/find_culprit_at_first_revision_of_a_sub_range.json
+++ b/recipes/recipes/findit/chromium/compile.expected/find_culprit_at_first_revision_of_a_sub_range.json
@@ -1067,6 +1067,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1900,6 +1901,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_middle_of_a_sub_range.json b/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_middle_of_a_sub_range.json
index 3b18c23..5c426ce 100644
--- a/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_middle_of_a_sub_range.json
+++ b/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_middle_of_a_sub_range.json
@@ -1083,6 +1083,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1900,6 +1901,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json b/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json
index 289d542..33518ec 100644
--- a/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json
+++ b/recipes/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json
@@ -1071,6 +1071,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1904,6 +1905,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2721,6 +2723,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json b/recipes/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
index 4fa4308..6c2482d 100644
--- a/recipes/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
+++ b/recipes/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
@@ -1071,6 +1071,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2269,6 +2270,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/first_revision_of_entire_range_failed_but_is_not_culprit.json b/recipes/recipes/findit/chromium/compile.expected/first_revision_of_entire_range_failed_but_is_not_culprit.json
index 06ec324..6774997 100644
--- a/recipes/recipes/findit/chromium/compile.expected/first_revision_of_entire_range_failed_but_is_not_culprit.json
+++ b/recipes/recipes/findit/chromium/compile.expected/first_revision_of_entire_range_failed_but_is_not_culprit.json
@@ -1066,6 +1066,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1883,6 +1884,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_bisect.json b/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_bisect.json
index e9bcf58..877788e 100644
--- a/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_bisect.json
+++ b/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_bisect.json
@@ -1087,6 +1087,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1920,6 +1921,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2753,6 +2755,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3586,6 +3589,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_not_bisect.json b/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_not_bisect.json
index 5abc21f..1b10d47 100644
--- a/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_not_bisect.json
+++ b/recipes/recipes/findit/chromium/compile.expected/last_revision_pass_not_bisect.json
@@ -1082,6 +1082,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -1915,6 +1916,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json b/recipes/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
index 4837146..1a42b87 100644
--- a/recipes/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
+++ b/recipes/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
@@ -1145,6 +1145,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json b/recipes/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
index 4ced186..3d6ba1b 100644
--- a/recipes/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
+++ b/recipes/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
@@ -1144,6 +1144,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json b/recipes/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
index d15f429..67ad509 100644
--- a/recipes/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
+++ b/recipes/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
@@ -1125,6 +1125,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json b/recipes/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
index 754598a..9e0be3b 100644
--- a/recipes/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
+++ b/recipes/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
@@ -1144,6 +1144,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/flake.expected/record_infra_failure.json b/recipes/recipes/findit/chromium/flake.expected/record_infra_failure.json
index aedeb5d..84bc9a4 100644
--- a/recipes/recipes/findit/chromium/flake.expected/record_infra_failure.json
+++ b/recipes/recipes/findit/chromium/flake.expected/record_infra_failure.json
@@ -1018,6 +1018,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/all_test_failed.json b/recipes/recipes/findit/chromium/test.expected/all_test_failed.json
index 59e40d3..dc28360 100644
--- a/recipes/recipes/findit/chromium/test.expected/all_test_failed.json
+++ b/recipes/recipes/findit/chromium/test.expected/all_test_failed.json
@@ -1059,6 +1059,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/all_test_passed.json b/recipes/recipes/findit/chromium/test.expected/all_test_passed.json
index d641c20..9042093 100644
--- a/recipes/recipes/findit/chromium/test.expected/all_test_passed.json
+++ b/recipes/recipes/findit/chromium/test.expected/all_test_passed.json
@@ -1056,6 +1056,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/blink_web_tests.json b/recipes/recipes/findit/chromium/test.expected/blink_web_tests.json
index ac784e4..47d5bbf 100644
--- a/recipes/recipes/findit/chromium/test.expected/blink_web_tests.json
+++ b/recipes/recipes/findit/chromium/test.expected/blink_web_tests.json
@@ -1163,6 +1163,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2426,6 +2427,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/builder_as_tester.json b/recipes/recipes/findit/chromium/test.expected/builder_as_tester.json
index 3e6de15..5503c75 100644
--- a/recipes/recipes/findit/chromium/test.expected/builder_as_tester.json
+++ b/recipes/recipes/findit/chromium/test.expected/builder_as_tester.json
@@ -1024,6 +1024,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json b/recipes/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
index a4b4624..4332638 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
@@ -1163,6 +1163,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2387,6 +2388,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3551,6 +3553,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
index 30e3083..f5ece9e 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
@@ -1163,6 +1163,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2387,6 +2388,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3551,6 +3553,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
index 27b48c4..035ccad 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
@@ -1163,6 +1163,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2390,6 +2391,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
index 4b57f1a..c8da0c9 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
@@ -1166,6 +1166,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2391,6 +2392,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3552,6 +3554,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -4716,6 +4719,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json b/recipes/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
index 15bf599..03122a9 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
@@ -1175,6 +1175,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2689,6 +2690,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3867,6 +3869,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -5037,6 +5040,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json b/recipes/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
index 1135722..631ea91 100644
--- a/recipes/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
+++ b/recipes/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
@@ -1166,6 +1166,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2404,6 +2405,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -3579,6 +3581,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -4751,6 +4754,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -5915,6 +5919,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/flaky_tests.json b/recipes/recipes/findit/chromium/test.expected/flaky_tests.json
index 2d4ca78..e8c883b 100644
--- a/recipes/recipes/findit/chromium/test.expected/flaky_tests.json
+++ b/recipes/recipes/findit/chromium/test.expected/flaky_tests.json
@@ -1059,6 +1059,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2242,6 +2243,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/none_swarming_tests.json b/recipes/recipes/findit/chromium/test.expected/none_swarming_tests.json
index 273e786..840a0cf 100644
--- a/recipes/recipes/findit/chromium/test.expected/none_swarming_tests.json
+++ b/recipes/recipes/findit/chromium/test.expected/none_swarming_tests.json
@@ -1038,6 +1038,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/only_one_test_passed.json b/recipes/recipes/findit/chromium/test.expected/only_one_test_passed.json
index 35c38f7..692f061 100644
--- a/recipes/recipes/findit/chromium/test.expected/only_one_test_passed.json
+++ b/recipes/recipes/findit/chromium/test.expected/only_one_test_passed.json
@@ -1059,6 +1059,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2242,6 +2243,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/record_infra_failure.json b/recipes/recipes/findit/chromium/test.expected/record_infra_failure.json
index 78f8445..6797467 100644
--- a/recipes/recipes/findit/chromium/test.expected/record_infra_failure.json
+++ b/recipes/recipes/findit/chromium/test.expected/record_infra_failure.json
@@ -1033,6 +1033,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json b/recipes/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
index 771f2bd..f5d3d08 100644
--- a/recipes/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
+++ b/recipes/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
@@ -1166,6 +1166,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2394,6 +2395,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/swarming_tests.json b/recipes/recipes/findit/chromium/test.expected/swarming_tests.json
index be9c446..f3eae31 100644
--- a/recipes/recipes/findit/chromium/test.expected/swarming_tests.json
+++ b/recipes/recipes/findit/chromium/test.expected/swarming_tests.json
@@ -1158,6 +1158,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json b/recipes/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
index ba4684c..39e70b6 100644
--- a/recipes/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
+++ b/recipes/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
@@ -1174,6 +1174,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json b/recipes/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
index d02f5a4..8437bef 100644
--- a/recipes/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
+++ b/recipes/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
@@ -1161,6 +1161,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json b/recipes/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
index 4f9fe48..2722983 100644
--- a/recipes/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
+++ b/recipes/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
@@ -1163,6 +1163,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
@@ -2390,6 +2391,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"findit_variable\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "findit_variable",
       "--buildbot-mastername",
diff --git a/recipes/recipes/ios/try.expected/gn.json b/recipes/recipes/ios/try.expected/gn.json
index 90199ca..2e0a644 100644
--- a/recipes/recipes/ios/try.expected/gn.json
+++ b/recipes/recipes/ios/try.expected/gn.json
@@ -863,6 +863,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios-simulator-gn\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios-simulator-gn",
       "--buildbot-mastername",
diff --git a/recipes/recipes/ios/try.expected/goma_compilation_failure.json b/recipes/recipes/ios/try.expected/goma_compilation_failure.json
index 983ddb0..d3fa8f6 100644
--- a/recipes/recipes/ios/try.expected/goma_compilation_failure.json
+++ b/recipes/recipes/ios/try.expected/goma_compilation_failure.json
@@ -866,6 +866,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios-simulator-gn\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios-simulator-gn",
       "--buildbot-mastername",
diff --git a/recipes/recipes/ios/unified_builder_tester.expected/goma.json b/recipes/recipes/ios/unified_builder_tester.expected/goma.json
index 43b153c..9b0f6ad 100644
--- a/recipes/recipes/ios/unified_builder_tester.expected/goma.json
+++ b/recipes/recipes/ios/unified_builder_tester.expected/goma.json
@@ -741,6 +741,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/ios/unified_builder_tester.expected/goma_canary.json b/recipes/recipes/ios/unified_builder_tester.expected/goma_canary.json
index 4ae1219..5abb323 100644
--- a/recipes/recipes/ios/unified_builder_tester.expected/goma_canary.json
+++ b/recipes/recipes/ios/unified_builder_tester.expected/goma_canary.json
@@ -746,6 +746,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json b/recipes/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
index 509b1cf..6f6d0ef 100644
--- a/recipes/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
+++ b/recipes/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
@@ -751,6 +751,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_mips_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_mips_debug.json
index b2ccff0..a3682af 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_mips_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_mips_debug.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 MIPS Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 MIPS Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_x86_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_x86_debug.json
index 00135eb..4b46473 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_x86_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android32_x86_debug.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 x86 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 x86 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android64_x64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android64_x64_debug.json
index b84fb69..d407705 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android64_x64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android64_x64_debug.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android64 x64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android64 x64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_arm64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_arm64_debug.json
index 94d2a99..5be0b56 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_arm64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_arm64_debug.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android ARM64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android ARM64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug.json
index 9f27e40..fe1615f 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug_forced.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug_forced.json
index e72b6a9..8f08b97 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug_forced.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_debug_forced.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_release.json
index 43beddb..f76aecd 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_android_release.json
@@ -433,6 +433,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
index f35cb62..36007e5 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS ARM64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS ARM64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
index 772dfd3..31acf02 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS ARM64 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS ARM64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
index bc8b922..a0c36fd 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
index b170454..9b00777 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
index 4359947..5953c65 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_debug.json
index 63e6197..bc0e2bd 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_debug.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux32 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux32 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_release.json
index 6eb57ad..8b86d09 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux32_release.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux32 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux32 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug.json
index 4c70ea8..597fa3a 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug_forced.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug_forced.json
index d0e970e..ca76650 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug_forced.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug_forced.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release.json
index 981c6fd..83e7b19 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_asan.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_asan.json
index ef879b4..86726d9 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_asan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_asan.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Asan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_gcc.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_gcc.json
index fc8b0ab..15e4532 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_gcc.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_gcc.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux GCC\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux GCC",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_memcheck.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_memcheck.json
index a0466b7..2071933 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_memcheck.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_memcheck.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Memcheck\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Memcheck",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_msan.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_msan.json
index fbaa444..59d50a4 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_msan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_msan.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux MSan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux MSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_tsan_v2.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_tsan_v2.json
index d3bfed4..ab49dd4 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_tsan_v2.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_tsan_v2.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Tsan v2\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Tsan v2",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan.json
index ac83c6f..ad3bedb 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux UBSan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux UBSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan_vptr.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan_vptr.json
index efabf4f..7fb82c3 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan_vptr.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_linux_ubsan_vptr.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux UBSan vptr\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux UBSan vptr",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
index abe823d..b2acc16 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
@@ -493,6 +493,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
index d8c4a2d..87cbbd1 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
@@ -493,6 +493,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac64 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
index dd66cc2..dc63b97 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
@@ -493,6 +493,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac Asan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac Asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug.json
index f73865d..9070312 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug__clang_.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug__clang_.json
index 7a3539c..7977929 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug__clang_.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_debug__clang_.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Debug (Clang)\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Debug (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release.json
index c89866b..8a25907 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release__clang_.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release__clang_.json
index 013ba17..c48419b 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release__clang_.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win32_release__clang_.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Release (Clang)\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Release (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug.json
index 017b977..2ee9f6c 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Debug\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__clang_.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__clang_.json
index 8a32c60..fbf83ab 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__clang_.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__clang_.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Debug (Clang)\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Debug (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release.json
index 9f513ac..5ed1cb3 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release.json
@@ -428,6 +428,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Release\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json
index 48c5fb4..67e3965 100644
--- a/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json
+++ b/recipes/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json
@@ -455,6 +455,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Release (Clang)\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Release (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android.json
index 0b31a61..7159ffb 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_arm64.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_arm64.json
index 3d64b9d..2da8e2b 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_arm64.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_arm64.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm64\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm64",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
index 7d6fa36..9c7deea 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_mips.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_mips\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_mips",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_rel.json
index 9700e30..475eb83 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_rel.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x64.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x64.json
index 685f42f..690c3d5 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x64.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x64.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_x64\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_x64",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x86.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x86.json
index 2ba3eb5..77a3412 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x86.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_x86.json
@@ -479,6 +479,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_x86\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_x86",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
index 9a7a23a..b22fd18 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
@@ -586,6 +586,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
index 0e05c2f..4e4dcc2 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
@@ -586,6 +586,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_arm64\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_arm64",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
index 0f0147e..6aeb0fd 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
@@ -586,6 +586,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_arm64_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
index 0207e1a..e354337 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
@@ -586,6 +586,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux.json
index 15d1cd4..8090929 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_asan.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_asan.json
index 7eddd3b..3b9ed3a 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_asan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_asan.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_asan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_forced.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_forced.json
index b9dfddc..c803bed 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_forced.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_forced.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gcc.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gcc.json
index 0dbceb2..313461c 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gcc.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gcc.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_gcc\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_gcc",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
index a7f7aa0..0dcd925 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_memcheck\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_memcheck",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_msan.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_msan.json
index f92e02a..ac51358 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_msan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_msan.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_msan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_msan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_rel.json
index b85378d..7894849 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_rel.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_tsan2.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_tsan2.json
index 430d122..abf90f8 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_tsan2.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_tsan2.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_tsan2\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_tsan2",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan.json
index bed9354..772d281 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_ubsan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_ubsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan_vptr.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan_vptr.json
index 13dabff..b3e0f2e 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan_vptr.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_ubsan_vptr.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_ubsan_vptr\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_ubsan_vptr",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
index 6f9c84c..d541b32 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
@@ -539,6 +539,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
index a067367..fa5489c 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
@@ -539,6 +539,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_asan\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
index 4f2b88e..b6b06d4 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
@@ -539,6 +539,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win.json
index 219295d..a816ef9 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
index 6c9a1ac..4c15645 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_clang\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_clang",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang_rel.json
index d9ffa0b..24926a6 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang_rel.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_clang_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_rel.json
index d734d79..afdef41 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_rel.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_clang_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_clang_rel.json
index c8ea2e0..6f4d30b 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_clang_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_clang_rel.json
@@ -501,6 +501,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_clang_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
index 7df8448..e0b2fd0 100644
--- a/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
+++ b/recipes/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_rel\", \"project\": \"libyuv\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/linux_triggering_arm.json b/recipes/recipes/nacl.expected/linux_triggering_arm.json
index ac32f83..a7cb8cb 100644
--- a/recipes/recipes/nacl.expected/linux_triggering_arm.json
+++ b/recipes/recipes/nacl.expected/linux_triggering_arm.json
@@ -497,6 +497,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_64-newlib-arm_qemu-pnacl-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_64-newlib-arm_qemu-pnacl-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_BOT_DIED.json b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_BOT_DIED.json
index a70800f..5d716ce 100644
--- a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_BOT_DIED.json
+++ b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_BOT_DIED.json
@@ -497,6 +497,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_64-newlib-arm_qemu-pnacl-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_64-newlib-arm_qemu-pnacl-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_COMPLETED_and_failed.json b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_COMPLETED_and_failed.json
index ddcefe6..54c423e 100644
--- a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_COMPLETED_and_failed.json
+++ b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_COMPLETED_and_failed.json
@@ -497,6 +497,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_64-newlib-arm_qemu-pnacl-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_64-newlib-arm_qemu-pnacl-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_TIMED_OUT.json b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_TIMED_OUT.json
index 08f09f9..baee362 100644
--- a/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_TIMED_OUT.json
+++ b/recipes/recipes/nacl.expected/linux_triggering_arm_with_collect_TIMED_OUT.json
@@ -497,6 +497,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_64-newlib-arm_qemu-pnacl-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_64-newlib-arm_qemu-pnacl-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/linux_triggering_failed.json b/recipes/recipes/nacl.expected/linux_triggering_failed.json
index b2ac23d..8132f0e 100644
--- a/recipes/recipes/nacl.expected/linux_triggering_failed.json
+++ b/recipes/recipes/nacl.expected/linux_triggering_failed.json
@@ -498,6 +498,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_64-newlib-arm_qemu-pnacl-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_64-newlib-arm_qemu-pnacl-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/mac.json b/recipes/recipes/nacl.expected/mac.json
index 8aa3c3d..f75d1c9 100644
--- a/recipes/recipes/nacl.expected/mac.json
+++ b/recipes/recipes/nacl.expected/mac.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac-newlib-dbg-asan\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac-newlib-dbg-asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/nacl.expected/win.json b/recipes/recipes/nacl.expected/win.json
index 29d049c..058a62f 100644
--- a/recipes/recipes/nacl.expected/win.json
+++ b/recipes/recipes/nacl.expected/win.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win7-64-glibc-dbg\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win7-64-glibc-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/openscreen.expected/linux64_coverage_debug.json b/recipes/recipes/openscreen.expected/linux64_coverage_debug.json
index 0ac74ba..cdb1c1e 100644
--- a/recipes/recipes/openscreen.expected/linux64_coverage_debug.json
+++ b/recipes/recipes/openscreen.expected/linux64_coverage_debug.json
@@ -515,6 +515,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_coverage_debug_failed_coverage_init.json b/recipes/recipes/openscreen.expected/linux64_coverage_debug_failed_coverage_init.json
index 34c3054..5e305f1 100644
--- a/recipes/recipes/openscreen.expected/linux64_coverage_debug_failed_coverage_init.json
+++ b/recipes/recipes/openscreen.expected/linux64_coverage_debug_failed_coverage_init.json
@@ -454,6 +454,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_coverage_debug_full_repo_coverage.json b/recipes/recipes/openscreen.expected/linux64_coverage_debug_full_repo_coverage.json
index 1ad9e4c..bbbb197 100644
--- a/recipes/recipes/openscreen.expected/linux64_coverage_debug_full_repo_coverage.json
+++ b/recipes/recipes/openscreen.expected/linux64_coverage_debug_full_repo_coverage.json
@@ -448,6 +448,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profdata_does_fail_bot.json b/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profdata_does_fail_bot.json
index 8feb8c5..a512722 100644
--- a/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profdata_does_fail_bot.json
+++ b/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profdata_does_fail_bot.json
@@ -515,6 +515,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profraw_does_fail_bot.json b/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profraw_does_fail_bot.json
index 660bae7..8bcb145 100644
--- a/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profraw_does_fail_bot.json
+++ b/recipes/recipes/openscreen.expected/linux64_coverage_debug_no_profraw_does_fail_bot.json
@@ -515,6 +515,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_debug.json b/recipes/recipes/openscreen.expected/linux64_debug.json
index 3d4377f..b0b7eaa 100644
--- a/recipes/recipes/openscreen.expected/linux64_debug.json
+++ b/recipes/recipes/openscreen.expected/linux64_debug.json
@@ -429,6 +429,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux64_tsan.json b/recipes/recipes/openscreen.expected/linux64_tsan.json
index 2d88648..595a1ec 100644
--- a/recipes/recipes/openscreen.expected/linux64_tsan.json
+++ b/recipes/recipes/openscreen.expected/linux64_tsan.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux_arm64_debug.json b/recipes/recipes/openscreen.expected/linux_arm64_debug.json
index 3ded6ec..c63e815 100644
--- a/recipes/recipes/openscreen.expected/linux_arm64_debug.json
+++ b/recipes/recipes/openscreen.expected/linux_arm64_debug.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux_arm64_debug_ci.json b/recipes/recipes/openscreen.expected/linux_arm64_debug_ci.json
index 5958dfd..88a0e17 100644
--- a/recipes/recipes/openscreen.expected/linux_arm64_debug_ci.json
+++ b/recipes/recipes/openscreen.expected/linux_arm64_debug_ci.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
index 0933be1..13301b9 100644
--- a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
+++ b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_BOT_DIED.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
index 77a25d5..2fe5121 100644
--- a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
+++ b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_COMPLETED_and_failed.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
index 4ce9d80..7ecd858 100644
--- a/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
+++ b/recipes/recipes/openscreen.expected/linux_arm64_debug_with_collect_TIMED_OUT.json
@@ -413,6 +413,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/openscreen.expected/mac_debug.json b/recipes/recipes/openscreen.expected/mac_debug.json
index 1106256..4be2049 100644
--- a/recipes/recipes/openscreen.expected/mac_debug.json
+++ b/recipes/recipes/openscreen.expected/mac_debug.json
@@ -469,6 +469,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"openscreen\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "builder",
       "--buildbot-slavename",
diff --git a/recipes/recipes/pdfium.expected/android.json b/recipes/recipes/pdfium.expected/android.json
index e01fd2a..784fb35 100644
--- a/recipes/recipes/pdfium.expected/android.json
+++ b/recipes/recipes/pdfium.expected/android.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-corpus-tests-javascript-disabled.json b/recipes/recipes/pdfium.expected/fail-corpus-tests-javascript-disabled.json
index 8658ab1..38304cc0 100644
--- a/recipes/recipes/pdfium.expected/fail-corpus-tests-javascript-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-corpus-tests-javascript-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-corpus-tests-xfa-disabled.json b/recipes/recipes/pdfium.expected/fail-corpus-tests-xfa-disabled.json
index eeec5c9..f103e06 100644
--- a/recipes/recipes/pdfium.expected/fail-corpus-tests-xfa-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-corpus-tests-xfa-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-corpus-tests.json b/recipes/recipes/pdfium.expected/fail-corpus-tests.json
index 3c9ec3b..2165041 100644
--- a/recipes/recipes/pdfium.expected/fail-corpus-tests.json
+++ b/recipes/recipes/pdfium.expected/fail-corpus-tests.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-download-hashes-file.json b/recipes/recipes/pdfium.expected/fail-download-hashes-file.json
index c4e28f3..0bad15f 100644
--- a/recipes/recipes/pdfium.expected/fail-download-hashes-file.json
+++ b/recipes/recipes/pdfium.expected/fail-download-hashes-file.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-embeddertests.json b/recipes/recipes/pdfium.expected/fail-embeddertests.json
index 13c8cb1..7b3013f 100644
--- a/recipes/recipes/pdfium.expected/fail-embeddertests.json
+++ b/recipes/recipes/pdfium.expected/fail-embeddertests.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-javascript-tests-javascript-disabled.json b/recipes/recipes/pdfium.expected/fail-javascript-tests-javascript-disabled.json
index 191b8ce..6baac04 100644
--- a/recipes/recipes/pdfium.expected/fail-javascript-tests-javascript-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-javascript-tests-javascript-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-javascript-tests-xfa-disabled.json b/recipes/recipes/pdfium.expected/fail-javascript-tests-xfa-disabled.json
index 9259986..83bba7b 100644
--- a/recipes/recipes/pdfium.expected/fail-javascript-tests-xfa-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-javascript-tests-xfa-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-javascript-tests.json b/recipes/recipes/pdfium.expected/fail-javascript-tests.json
index 39c7a85..2134687 100644
--- a/recipes/recipes/pdfium.expected/fail-javascript-tests.json
+++ b/recipes/recipes/pdfium.expected/fail-javascript-tests.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-pixel-tests-javascript-disabled.json b/recipes/recipes/pdfium.expected/fail-pixel-tests-javascript-disabled.json
index 2737c68..7595f67 100644
--- a/recipes/recipes/pdfium.expected/fail-pixel-tests-javascript-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-pixel-tests-javascript-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-pixel-tests-xfa-disabled.json b/recipes/recipes/pdfium.expected/fail-pixel-tests-xfa-disabled.json
index f235d6a..9898afd 100644
--- a/recipes/recipes/pdfium.expected/fail-pixel-tests-xfa-disabled.json
+++ b/recipes/recipes/pdfium.expected/fail-pixel-tests-xfa-disabled.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-pixel-tests.json b/recipes/recipes/pdfium.expected/fail-pixel-tests.json
index b2dfa9a..d7893c8 100644
--- a/recipes/recipes/pdfium.expected/fail-pixel-tests.json
+++ b/recipes/recipes/pdfium.expected/fail-pixel-tests.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/fail-unittests.json b/recipes/recipes/pdfium.expected/fail-unittests.json
index 2288858..e3a8c70 100644
--- a/recipes/recipes/pdfium.expected/fail-unittests.json
+++ b/recipes/recipes/pdfium.expected/fail-unittests.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux.json b/recipes/recipes/pdfium.expected/linux.json
index 06d4ca5..1a21079 100644
--- a/recipes/recipes/pdfium.expected/linux.json
+++ b/recipes/recipes/pdfium.expected/linux.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_asan_lsan.json b/recipes/recipes/pdfium.expected/linux_asan_lsan.json
index 0a32d38..bebd06f 100644
--- a/recipes/recipes/pdfium.expected/linux_asan_lsan.json
+++ b/recipes/recipes/pdfium.expected/linux_asan_lsan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_asan_lsan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_asan_lsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_component.json b/recipes/recipes/pdfium.expected/linux_component.json
index dae9a17..fd76846 100644
--- a/recipes/recipes/pdfium.expected/linux_component.json
+++ b/recipes/recipes/pdfium.expected/linux_component.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_component\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_component",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_msan.json b/recipes/recipes/pdfium.expected/linux_msan.json
index bfa2b04..2dcffcb 100644
--- a/recipes/recipes/pdfium.expected/linux_msan.json
+++ b/recipes/recipes/pdfium.expected/linux_msan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_msan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_msan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_no_v8.json b/recipes/recipes/pdfium.expected/linux_no_v8.json
index 2d9026d..5cb9950 100644
--- a/recipes/recipes/pdfium.expected/linux_no_v8.json
+++ b/recipes/recipes/pdfium.expected/linux_no_v8.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_no_v8\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_no_v8",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_skia.json b/recipes/recipes/pdfium.expected/linux_skia.json
index 789f7c5..36bc445 100644
--- a/recipes/recipes/pdfium.expected/linux_skia.json
+++ b/recipes/recipes/pdfium.expected/linux_skia.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_skia\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_skia",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_skia_paths.json b/recipes/recipes/pdfium.expected/linux_skia_paths.json
index d6a4e6a..464b188 100644
--- a/recipes/recipes/pdfium.expected/linux_skia_paths.json
+++ b/recipes/recipes/pdfium.expected/linux_skia_paths.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_skia_paths\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_skia_paths",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_ubsan.json b/recipes/recipes/pdfium.expected/linux_ubsan.json
index 674d413..663ba99 100644
--- a/recipes/recipes/pdfium.expected/linux_ubsan.json
+++ b/recipes/recipes/pdfium.expected/linux_ubsan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_ubsan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_ubsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_xfa.json b/recipes/recipes/pdfium.expected/linux_xfa.json
index ef3e1cc..e325779 100644
--- a/recipes/recipes/pdfium.expected/linux_xfa.json
+++ b/recipes/recipes/pdfium.expected/linux_xfa.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_xfa\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_xfa_asan_lsan.json b/recipes/recipes/pdfium.expected/linux_xfa_asan_lsan.json
index ee60d6c..d87014b 100644
--- a/recipes/recipes/pdfium.expected/linux_xfa_asan_lsan.json
+++ b/recipes/recipes/pdfium.expected/linux_xfa_asan_lsan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_xfa_asan_lsan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa_asan_lsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_xfa_msan.json b/recipes/recipes/pdfium.expected/linux_xfa_msan.json
index ee51e03..b7561e8 100644
--- a/recipes/recipes/pdfium.expected/linux_xfa_msan.json
+++ b/recipes/recipes/pdfium.expected/linux_xfa_msan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_xfa_msan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa_msan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_xfa_rel.json b/recipes/recipes/pdfium.expected/linux_xfa_rel.json
index 453f169..1887c04 100644
--- a/recipes/recipes/pdfium.expected/linux_xfa_rel.json
+++ b/recipes/recipes/pdfium.expected/linux_xfa_rel.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_xfa_rel\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/linux_xfa_ubsan.json b/recipes/recipes/pdfium.expected/linux_xfa_ubsan.json
index c820a53..e673c5c 100644
--- a/recipes/recipes/pdfium.expected/linux_xfa_ubsan.json
+++ b/recipes/recipes/pdfium.expected/linux_xfa_ubsan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_xfa_ubsan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa_ubsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac.json b/recipes/recipes/pdfium.expected/mac.json
index bc4ad94..5455bac 100644
--- a/recipes/recipes/pdfium.expected/mac.json
+++ b/recipes/recipes/pdfium.expected/mac.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_component.json b/recipes/recipes/pdfium.expected/mac_component.json
index 8455ef1..878d908 100644
--- a/recipes/recipes/pdfium.expected/mac_component.json
+++ b/recipes/recipes/pdfium.expected/mac_component.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_component\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_component",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_no_v8.json b/recipes/recipes/pdfium.expected/mac_no_v8.json
index 1d7874f..c06300b 100644
--- a/recipes/recipes/pdfium.expected/mac_no_v8.json
+++ b/recipes/recipes/pdfium.expected/mac_no_v8.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_no_v8\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_no_v8",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_skia.json b/recipes/recipes/pdfium.expected/mac_skia.json
index 5560017..851e0ac 100644
--- a/recipes/recipes/pdfium.expected/mac_skia.json
+++ b/recipes/recipes/pdfium.expected/mac_skia.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_skia\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_skia",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_skia_paths.json b/recipes/recipes/pdfium.expected/mac_skia_paths.json
index bc6775a..f8a1e83 100644
--- a/recipes/recipes/pdfium.expected/mac_skia_paths.json
+++ b/recipes/recipes/pdfium.expected/mac_skia_paths.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_skia_paths\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_skia_paths",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_xfa.json b/recipes/recipes/pdfium.expected/mac_xfa.json
index d44af59..619d37e 100644
--- a/recipes/recipes/pdfium.expected/mac_xfa.json
+++ b/recipes/recipes/pdfium.expected/mac_xfa.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_xfa\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_xfa",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/mac_xfa_rel.json b/recipes/recipes/pdfium.expected/mac_xfa_rel.json
index 4d05311..34b2ba2 100644
--- a/recipes/recipes/pdfium.expected/mac_xfa_rel.json
+++ b/recipes/recipes/pdfium.expected/mac_xfa_rel.json
@@ -439,6 +439,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"mac_xfa_rel\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_xfa_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/success-download-hashes-file.json b/recipes/recipes/pdfium.expected/success-download-hashes-file.json
index 0037679..027c73e 100644
--- a/recipes/recipes/pdfium.expected/success-download-hashes-file.json
+++ b/recipes/recipes/pdfium.expected/success-download-hashes-file.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"android\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/try-linux-gerrit_xfa_asan_lsan.json b/recipes/recipes/pdfium.expected/try-linux-gerrit_xfa_asan_lsan.json
index 6a39571..7ebf9c6 100644
--- a/recipes/recipes/pdfium.expected/try-linux-gerrit_xfa_asan_lsan.json
+++ b/recipes/recipes/pdfium.expected/try-linux-gerrit_xfa_asan_lsan.json
@@ -432,6 +432,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_xfa_asan_lsan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_xfa_asan_lsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win.json b/recipes/recipes/pdfium.expected/win.json
index c763d51..3dbe48f 100644
--- a/recipes/recipes/pdfium.expected/win.json
+++ b/recipes/recipes/pdfium.expected/win.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_asan.json b/recipes/recipes/pdfium.expected/win_asan.json
index 6f27993..20241f8 100644
--- a/recipes/recipes/pdfium.expected/win_asan.json
+++ b/recipes/recipes/pdfium.expected/win_asan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_asan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_component.json b/recipes/recipes/pdfium.expected/win_component.json
index 39f43dd..42ce6c9 100644
--- a/recipes/recipes/pdfium.expected/win_component.json
+++ b/recipes/recipes/pdfium.expected/win_component.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"win_component\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_component",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_no_v8.json b/recipes/recipes/pdfium.expected/win_no_v8.json
index 7d5875a..c52e3cb 100644
--- a/recipes/recipes/pdfium.expected/win_no_v8.json
+++ b/recipes/recipes/pdfium.expected/win_no_v8.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_no_v8\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_no_v8",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_skia.json b/recipes/recipes/pdfium.expected/win_skia.json
index b31d2d1..3e9f235 100644
--- a/recipes/recipes/pdfium.expected/win_skia.json
+++ b/recipes/recipes/pdfium.expected/win_skia.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_skia\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_skia",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_skia_paths.json b/recipes/recipes/pdfium.expected/win_skia_paths.json
index fbf18cc..6a0caf7 100644
--- a/recipes/recipes/pdfium.expected/win_skia_paths.json
+++ b/recipes/recipes/pdfium.expected/win_skia_paths.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_skia_paths\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_skia_paths",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_xfa.json b/recipes/recipes/pdfium.expected/win_xfa.json
index 79b4469..1454b9b 100644
--- a/recipes/recipes/pdfium.expected/win_xfa.json
+++ b/recipes/recipes/pdfium.expected/win_xfa.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_xfa\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_xfa",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_xfa_32.json b/recipes/recipes/pdfium.expected/win_xfa_32.json
index f7110f1a..1ff551c 100644
--- a/recipes/recipes/pdfium.expected/win_xfa_32.json
+++ b/recipes/recipes/pdfium.expected/win_xfa_32.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_xfa_32\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_xfa_32",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_xfa_asan.json b/recipes/recipes/pdfium.expected/win_xfa_asan.json
index 3fe1b65..8d452d6 100644
--- a/recipes/recipes/pdfium.expected/win_xfa_asan.json
+++ b/recipes/recipes/pdfium.expected/win_xfa_asan.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_xfa_asan\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_xfa_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pdfium.expected/win_xfa_rel.json b/recipes/recipes/pdfium.expected/win_xfa_rel.json
index 02bbd93..4157829 100644
--- a/recipes/recipes/pdfium.expected/win_xfa_rel.json
+++ b/recipes/recipes/pdfium.expected/win_xfa_rel.json
@@ -386,6 +386,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"windows_xfa_rel\", \"project\": \"pdfium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "windows_xfa_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/pinpoint/builder.expected/basic.json b/recipes/recipes/pinpoint/builder.expected/basic.json
index 8a5c3f4..5be6d6e 100644
--- a/recipes/recipes/pinpoint/builder.expected/basic.json
+++ b/recipes/recipes/pinpoint/builder.expected/basic.json
@@ -781,6 +781,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android Compile Perf\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android Compile Perf",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android.json
index 66ad606..cff28a5 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android.json
@@ -649,6 +649,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android",
       "--buildbot-mastername",
@@ -1057,6 +1058,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg_.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg_.json
index 9417300..a25f4e6 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg_.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg_.json
@@ -649,6 +649,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android (dbg)",
       "--buildbot-mastername",
@@ -1057,6 +1058,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg__fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg__fail.json
index 4ada0bc..867903b 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg__fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android__dbg__fail.json
@@ -649,6 +649,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android (dbg)",
       "--buildbot-mastername",
@@ -1057,6 +1058,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android_fail.json
index 4fe0fba..3637926 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Android_fail.json
@@ -649,6 +649,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android",
       "--buildbot-mastername",
@@ -1057,6 +1058,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Android\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Android",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg_.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg_.json
index 916c4ad..a3e9035 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg_.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg_.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Fuchsia (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Fuchsia (dbg)",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Fuchsia (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Fuchsia (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg__fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg__fail.json
index 719e4e7..c1e6980 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg__fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Fuchsia__dbg__fail.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Fuchsia (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Fuchsia (dbg)",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Fuchsia (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Fuchsia (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux.json
index 81bf21f..0289007 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg_.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg_.json
index 835accb..587e87c 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg_.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg_.json
@@ -842,6 +842,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg__fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg__fail.json
index ef3386f..4af4252 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg__fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux__dbg__fail.json
@@ -842,6 +842,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux_fail.json
index 2be3cb2..120e73c 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Deterministic_Linux_fail.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Deterministic Linux\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Deterministic Linux",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
index 8844517..076ea0f 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
@@ -710,6 +710,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic",
       "--buildbot-mastername",
@@ -1146,6 +1147,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
index 7f94c038..c2dcd1c 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
@@ -710,6 +710,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic (dbg)",
       "--buildbot-mastername",
@@ -1146,6 +1147,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
index 8d9caf8..4cc837a 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
@@ -710,6 +710,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic (dbg)",
       "--buildbot-mastername",
@@ -1146,6 +1147,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic (dbg)\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
index 4c0321b..a31420c 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
@@ -710,6 +710,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic",
       "--buildbot-mastername",
@@ -1146,6 +1147,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic.json
index e54e073..9b08507 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Windows deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Windows deterministic",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Windows deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Windows deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic_fail.json
index 0db0a26..f611058 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic_fail.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Windows deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Windows deterministic",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Windows deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Windows deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg.json
index 03911f5..1f12ce6 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg.json
@@ -695,6 +695,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-dbg\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-dbg",
       "--buildbot-mastername",
@@ -1103,6 +1104,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-dbg\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg_fail.json
index b2d90dc..74e17bf 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_dbg_fail.json
@@ -695,6 +695,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-dbg\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-dbg",
       "--buildbot-mastername",
@@ -1103,6 +1104,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-dbg\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel.json
index 06a3720..8b4bbe4 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel.json
@@ -695,6 +695,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-rel",
       "--buildbot-mastername",
@@ -1103,6 +1104,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel_fail.json
index c8f3af8..72b8bbf 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_android_deterministic_rel_fail.json
@@ -695,6 +695,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-rel",
       "--buildbot-mastername",
@@ -1103,6 +1104,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android-deterministic-rel\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-deterministic-rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic.json
index cf20056..1f22065 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_chromium_clobber_deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_chromium_clobber_deterministic",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_chromium_clobber_deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_chromium_clobber_deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic_fail.json b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic_fail.json
index 46216f6..535d2ad 100644
--- a/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic_fail.json
+++ b/recipes/recipes/swarming/deterministic_build.expected/full_chromium_swarm_linux_chromium_clobber_deterministic_fail.json
@@ -687,6 +687,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_chromium_clobber_deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_chromium_clobber_deterministic",
       "--buildbot-mastername",
@@ -1069,6 +1070,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux_chromium_clobber_deterministic\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_chromium_clobber_deterministic",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/staging.expected/android.json b/recipes/recipes/swarming/staging.expected/android.json
index 0d68234..533926e 100644
--- a/recipes/recipes/swarming/staging.expected/android.json
+++ b/recipes/recipes/swarming/staging.expected/android.json
@@ -707,6 +707,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"dev\", \"builder\": \"android-lollipop-arm-rel-swarming\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android-lollipop-arm-rel-swarming",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/staging.expected/linux-rel-swarming-staging.json b/recipes/recipes/swarming/staging.expected/linux-rel-swarming-staging.json
index 4cc16b6..f6d6ea0 100644
--- a/recipes/recipes/swarming/staging.expected/linux-rel-swarming-staging.json
+++ b/recipes/recipes/swarming/staging.expected/linux-rel-swarming-staging.json
@@ -694,6 +694,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"dev\", \"builder\": \"linux-rel-swarming-staging\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel-swarming-staging",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/staging.expected/one_fails.json b/recipes/recipes/swarming/staging.expected/one_fails.json
index cdd535d..8feb9c5 100644
--- a/recipes/recipes/swarming/staging.expected/one_fails.json
+++ b/recipes/recipes/swarming/staging.expected/one_fails.json
@@ -694,6 +694,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"dev\", \"builder\": \"linux-rel-swarming\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux-rel-swarming",
       "--buildbot-mastername",
diff --git a/recipes/recipes/swarming/staging.expected/windows.json b/recipes/recipes/swarming/staging.expected/windows.json
index 06c541e..04aa7fb 100644
--- a/recipes/recipes/swarming/staging.expected/windows.json
+++ b/recipes/recipes/swarming/staging.expected/windows.json
@@ -708,6 +708,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"dev\", \"builder\": \"win-rel-swarming\", \"project\": \"chromium\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win-rel-swarming",
       "--buildbot-mastername",
diff --git a/recipes/recipes/v8/archive.expected/full_client_v8_official_V8_Foobar_update_beta.json b/recipes/recipes/v8/archive.expected/full_client_v8_official_V8_Foobar_update_beta.json
index c9b474d..c6f3674 100644
--- a/recipes/recipes/v8/archive.expected/full_client_v8_official_V8_Foobar_update_beta.json
+++ b/recipes/recipes/v8/archive.expected/full_client_v8_official_V8_Foobar_update_beta.json
@@ -512,6 +512,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"V8 Foobar\", \"project\": \"v8\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "V8 Foobar",
       "--buildbot-mastername",
diff --git a/recipes/recipes/wasm_llvm.expected/linux.json b/recipes/recipes/wasm_llvm.expected/linux.json
index 75f23c4..ff536ef 100644
--- a/recipes/recipes/wasm_llvm.expected/linux.json
+++ b/recipes/recipes/wasm_llvm.expected/linux.json
@@ -456,6 +456,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"wasm\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/wasm_llvm.expected/linux_fail.json b/recipes/recipes/wasm_llvm.expected/linux_fail.json
index aa7ba99..833d27c 100644
--- a/recipes/recipes/wasm_llvm.expected/linux_fail.json
+++ b/recipes/recipes/wasm_llvm.expected/linux_fail.json
@@ -457,6 +457,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"linux\", \"project\": \"wasm\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux",
       "--buildbot-slavename",
diff --git a/recipes/recipes/webrtc/chromium_ios.expected/basic_goma_build.json b/recipes/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
index ac50ba7..08d2b68 100644
--- a/recipes/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
+++ b/recipes/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
@@ -720,6 +720,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"ios\", \"project\": \"project\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
index cb604fb..2c4aec4 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS32 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS32 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
index 18f2321..1c8894a 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS32 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS32 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
index c27ef90..1d65a0a 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
index 7f80711..26372d2 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
index 2f30ad2..4ee1e8f 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
@@ -1095,6 +1095,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Sim Debug (iOS 10.0)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Sim Debug (iOS 10.0)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
index 6320514..cbf657e 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
@@ -1095,6 +1095,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Sim Debug (iOS 11)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Sim Debug (iOS 11)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
index b9aa637..b4d736a 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
@@ -1095,6 +1095,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Sim Debug (iOS 12)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Sim Debug (iOS 12)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
index d2cdeab..44638b3 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
@@ -919,6 +919,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Debug\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
index 6f0d860..1116adc 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
@@ -771,6 +771,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Perf\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Perf",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
index bdae690..6f16223 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
@@ -919,6 +919,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"iOS64 Release\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "iOS64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
index 71185ac..f508f57 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
@@ -1046,6 +1046,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_arm64_dbg\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_arm64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
index 55d5560..391576a 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
@@ -878,6 +878,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_arm64_perf\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_arm64_perf",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
index 0790d23..dbcf2b8 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
@@ -1046,6 +1046,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_arm64_rel\", \"project\": \"webrtc-internal\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
index 1cb698a..05c19e6 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
@@ -910,6 +910,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_compile_arm64_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_compile_arm64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
index 16d3ef6..d355a67 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
@@ -910,6 +910,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_compile_arm64_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_compile_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
index 2d4d28c..8a8388f 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
@@ -910,6 +910,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_compile_arm_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_compile_arm_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
index 6e9d905..36a71bc 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
@@ -910,6 +910,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_compile_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_compile_arm_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
index 3595bbd..826d490 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
@@ -1238,6 +1238,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_sim_x64_dbg_ios10\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_sim_x64_dbg_ios10",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10_gn_analyze_no_dependency.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10_gn_analyze_no_dependency.json
index e39ea62..7f1003b 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10_gn_analyze_no_dependency.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10_gn_analyze_no_dependency.json
@@ -1196,6 +1196,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_sim_x64_dbg_ios10\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_sim_x64_dbg_ios10",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
index d04d925..20c4824 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
@@ -1238,6 +1238,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_sim_x64_dbg_ios11\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_sim_x64_dbg_ios11",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
index 69a7058..a265f4a 100644
--- a/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
+++ b/recipes/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
@@ -1238,6 +1238,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"ios_sim_x64_dbg_ios12\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "ios_sim_x64_dbg_ios12",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_ci_linux64_release_libfuzzer.json b/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_ci_linux64_release_libfuzzer.json
index 51f4892..3d5709f 100644
--- a/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_ci_linux64_release_libfuzzer.json
+++ b/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_ci_linux64_release_libfuzzer.json
@@ -494,6 +494,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Release (Libfuzzer)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Release (Libfuzzer)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_try_linux_libfuzzer_rel.json b/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_try_linux_libfuzzer_rel.json
index 93da024..a8cd701 100644
--- a/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_try_linux_libfuzzer_rel.json
+++ b/recipes/recipes/webrtc/libfuzzer.expected/luci_webrtc_try_linux_libfuzzer_rel.json
@@ -540,6 +540,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_libfuzzer_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_libfuzzer_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_android32_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_android32_more_configs.json
index 30d2643..550b55e 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_android32_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_android32_more_configs.json
@@ -478,6 +478,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (more configs)",
       "--buildbot-mastername",
@@ -848,6 +849,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (more configs)",
       "--buildbot-mastername",
@@ -1218,6 +1220,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (more configs)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
index 6259fe3..2b11475 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
@@ -472,6 +472,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux (more configs)",
       "--buildbot-mastername",
@@ -837,6 +838,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux (more configs)",
       "--buildbot-mastername",
@@ -1219,6 +1221,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux (more configs)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
index 7f212bf..5b6bdc4 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
@@ -472,6 +472,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win (more configs)",
       "--buildbot-mastername",
@@ -837,6 +838,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win (more configs)",
       "--buildbot-mastername",
@@ -1219,6 +1221,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win (more configs)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win (more configs)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_android_arm_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_android_arm_more_configs.json
index da16826..e8fd6a4 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_android_arm_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_android_arm_more_configs.json
@@ -584,6 +584,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_more_configs",
       "--buildbot-mastername",
@@ -1014,6 +1015,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_more_configs",
       "--buildbot-mastername",
@@ -1449,6 +1451,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_more_configs",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
index ac690db..9290690 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
@@ -577,6 +577,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_more_configs",
       "--buildbot-mastername",
@@ -1001,6 +1002,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_more_configs",
       "--buildbot-mastername",
@@ -1445,6 +1447,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_more_configs",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
index 67597a2..4eb3cee 100644
--- a/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
+++ b/recipes/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
@@ -577,6 +577,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_more_configs",
       "--buildbot-mastername",
@@ -1001,6 +1002,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_more_configs",
       "--buildbot-mastername",
@@ -1445,6 +1447,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_more_configs\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_more_configs",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_arm.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_arm.json
index caf339b..03d9779 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_arm.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_arm.json
@@ -566,6 +566,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 Builder arm\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 Builder arm",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86.json
index 65f08bc..f4c2e57 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 Builder x86\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 Builder x86",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86_dbg.json
index a997fee..a8af1d6 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_builder_x86_dbg.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 Builder x86 (dbg)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 Builder x86 (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x.json
index 37e586c..f4e899b 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x.json
@@ -552,6 +552,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (M Nexus5X)",
       "--buildbot-mastername",
@@ -4084,6 +4085,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (M Nexus5X)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_dbg.json
index 4c1d215..04d6298 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_dbg.json
@@ -552,6 +552,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (M Nexus5X)(dbg)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (M Nexus5X)(dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_failing_archive.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_failing_archive.json
index 8791d47..bf11ef9 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_failing_archive.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android32_m_nexus5x_failing_archive.json
@@ -552,6 +552,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (M Nexus5X)",
       "--buildbot-mastername",
@@ -4087,6 +4088,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android32 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android32 (M Nexus5X)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_arm64.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_arm64.json
index 65258d0..4012d4b 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_arm64.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_arm64.json
@@ -566,6 +566,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android64 Builder arm64\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android64 Builder arm64",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_x64_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_x64_dbg.json
index d927181..a8dcda4 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_x64_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_builder_x64_dbg.json
@@ -474,6 +474,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android64 Builder x64 (dbg)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android64 Builder x64 (dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x.json
index d5acda6..6da3b17 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x.json
@@ -552,6 +552,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android64 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android64 (M Nexus5X)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x_dbg.json
index 16feeeb..85fd4a7 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_android64_m_nexus5x_dbg.json
@@ -552,6 +552,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Android64 (M Nexus5X)(dbg)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Android64 (M Nexus5X)(dbg)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
index 3b08024..f30e5d6 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
@@ -548,6 +548,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux32 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux32 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug_arm.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug_arm.json
index 8c8b6a3..fc31a84 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug_arm.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug_arm.json
@@ -468,6 +468,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux32 Debug (ARM)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux32 Debug (ARM)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_release_arm.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_release_arm.json
index d685e4a..c29eb0a 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_release_arm.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_release_arm.json
@@ -468,6 +468,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux32 Release (ARM)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux32 Release (ARM)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_builder.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_builder.json
index d7f8628..1d3cb63 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_builder.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_builder.json
@@ -508,6 +508,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Builder\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
index 21bb930..1557160 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
@@ -548,6 +548,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_arm.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_arm.json
index 20bc5e0..da80313 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_arm.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_arm.json
@@ -468,6 +468,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug (ARM)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug (ARM)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
index b8197f5..2e5c76d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
@@ -548,6 +548,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
index 21bb930..1557160 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
@@ -548,6 +548,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
index 2f5876b..09056be 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
@@ -551,6 +551,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_arm.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_arm.json
index 6b3b9a4..01389f7 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_arm.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_arm.json
@@ -468,6 +468,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Release (ARM)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Release (ARM)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_gcc.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_gcc.json
index 34e660e..6bd9d02 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_gcc.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release_gcc.json
@@ -468,6 +468,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux64 Release (GCC)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux64 Release (GCC)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
index 686bf76..dc1e2ac 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
@@ -575,6 +575,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Asan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
index e9649af..08f10b5 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
@@ -575,6 +575,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux MSan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux MSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
index bdcf4de..5486786 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
@@ -575,6 +575,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux Tsan v2\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux Tsan v2",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
index 0a1b348..0ce8341 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
@@ -575,6 +575,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux UBSan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux UBSan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
index 7655df4..4396d7f 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
@@ -575,6 +575,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Linux UBSan vptr\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Linux UBSan vptr",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
index 05c41f7..2984d7a 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
@@ -574,6 +574,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac64 Builder\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac64 Builder",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
index b59156a..ec4729c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
@@ -614,6 +614,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
index feb04dc..075243c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
@@ -617,6 +617,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac64 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
index 5aac045..4753b95 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
@@ -614,6 +614,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Mac Asan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Mac Asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_builder_clang.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_builder_clang.json
index 13d6d06..4b636ee 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_builder_clang.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_builder_clang.json
@@ -549,6 +549,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Builder (Clang)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Builder (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
index 3030fa4..c9d01f7 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
@@ -562,6 +562,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug_clang.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug_clang.json
index abcaa70..b65d0de 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug_clang.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug_clang.json
@@ -509,6 +509,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Debug (Clang)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Debug (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
index e05a59a..2e0671b 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
@@ -565,6 +565,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
index 34eaa9e..79005ee 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
@@ -592,6 +592,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win32 Release (Clang)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win32 Release (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
index be92334..34e1ce6 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
@@ -589,6 +589,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 ASan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 ASan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
index 64f1adb..bbb95de 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
@@ -562,6 +562,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Debug\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Debug",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug_clang.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug_clang.json
index c059fee..4c114e8 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug_clang.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug_clang.json
@@ -509,6 +509,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Debug (Clang)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Debug (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
index 4577163..228db3a 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
@@ -562,6 +562,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Release\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Release",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release_clang.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release_clang.json
index 822caec..00444b7 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release_clang.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release_clang.json
@@ -509,6 +509,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 Release (Clang)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 Release (Clang)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_uwp.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_uwp.json
index db7c7f6..a80773a 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_uwp.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_uwp.json
@@ -509,6 +509,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"Win64 UWP\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Win64 UWP",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_aosp_nexus6.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_aosp_nexus6.json
index f9c7fcb..5529c65 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_aosp_nexus6.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_aosp_nexus6.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android32 (M AOSP Nexus6)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android32 (M AOSP Nexus6)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5.json
index bd8dcc5..02d8cbe 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android32 (M Nexus5)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android32 (M Nexus5)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5_forced.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5_forced.json
index bd8dcc5..02d8cbe 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5_forced.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android32_m_nexus5_forced.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android32 (M Nexus5)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android32 (M Nexus5)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x.json
index 72491d2..4333959 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android64 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android64 (M Nexus5X)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x_failing_test.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x_failing_test.json
index e911377..cacb5e0 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x_failing_test.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_m_nexus5x_failing_test.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android64 (M Nexus5X)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android64 (M Nexus5X)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_o_pixel2.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_o_pixel2.json
index 0403939..0e6026a 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_o_pixel2.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_android64_o_pixel2.json
@@ -572,6 +572,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Android64 (O Pixel2)\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Android64 (O Pixel2)",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_trusty.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_trusty.json
index 5752f25..cc2f36d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_trusty.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_trusty.json
@@ -518,6 +518,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Linux Trusty\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Linux Trusty",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial.json
index fc1874d..5fe2376 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial.json
@@ -518,6 +518,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Linux Xenial\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Linux Xenial",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_experimental.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_experimental.json
index ccbc70b..24811f1 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_experimental.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_experimental.json
@@ -518,6 +518,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Linux Xenial\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--is-experimental",
       "--buildbot-buildername",
       "Perf Linux Xenial",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_failing_test.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_failing_test.json
index 2ba30aa..bd56e2e 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_failing_test.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_linux_xenial_failing_test.json
@@ -518,6 +518,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Linux Xenial\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Linux Xenial",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_mac_10_11.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_mac_10_11.json
index 167a16c..57a9d64 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_mac_10_11.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_mac_10_11.json
@@ -584,6 +584,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Mac 10.11\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Mac 10.11",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_win7.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_win7.json
index 95b5401..e4ba759 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_win7.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_perf_perf_win7.json
@@ -532,6 +532,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"perf\", \"builder\": \"Perf Win7\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "Perf Win7",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_dbg.json
index b7945e4..84f89e5 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_dbg.json
@@ -698,6 +698,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm64_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_rel.json
index 3fa7e54..64c9063 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm64_rel.json
@@ -698,6 +698,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm64_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_dbg.json
index 4a6e9ae..0bd7824 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_dbg.json
@@ -698,6 +698,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_rel.json
index a0bbb56..d079590 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_arm_rel.json
@@ -698,6 +698,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_rel",
       "--buildbot-mastername",
@@ -4463,6 +4464,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_arm_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_dbg.json
index 81ffa7f8..7e26860 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_dbg.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_arm64_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_arm64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_rel.json
index 04ec0ce..5f25777 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm64_rel.json
@@ -659,6 +659,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_arm64_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_dbg.json
index 0198b0e..1ac724c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_dbg.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_arm_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_arm_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_rel.json
index 91f04b6..defc680 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_arm_rel.json
@@ -659,6 +659,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_arm_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_dbg.json
index 0287ce1..97eb2e9 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_dbg.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_x64_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_x64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_rel.json
index 4149ef4..0bac4fb 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x64_rel.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_x64_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_x64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_dbg.json
index 1184636..4022202 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_dbg.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_x86_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_x86_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_rel.json
index def8cb0..e16ce08 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_compile_x86_rel.json
@@ -655,6 +655,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_compile_x86_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_compile_x86_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_experimental.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_experimental.json
index bd7b4d6..19ce866 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_experimental.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_android_experimental.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"android_experimental\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "android_experimental",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
index d2ab3be..450477e 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
@@ -715,6 +715,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_asan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_dbg.json
index 4ba94ae..ed38d3d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_dbg.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_arm64_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_arm64_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_rel.json
index 0b1722a..1779be6 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm64_rel.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_arm64_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_arm64_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_dbg.json
index 50c014b..f798837 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_dbg.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_arm_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_arm_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel.json
index e619d0c..c028f36 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_arm_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel_chromium.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel_chromium.json
index 1d4790f..d41dbdb 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel_chromium.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_arm_rel_chromium.json
@@ -750,6 +750,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_arm_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_arm_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_dbg.json
index 2dcc08e..291d44c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_dbg.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_gcc_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_gcc_rel.json
index 58bb396..c1fd3fe 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_gcc_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_gcc_rel.json
@@ -644,6 +644,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_gcc_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_gcc_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_rel.json
index d9dafff..454c1f5 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_compile_rel.json
@@ -646,6 +646,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_compile_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_compile_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
index 8e3c509..0036f5d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
@@ -688,6 +688,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
index 830ea88..5f43f14 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
@@ -688,6 +688,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_memcheck\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_memcheck",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
index e5c6f75..5584bfd 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
@@ -715,6 +715,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_msan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_msan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
index 1ba82bf..b582248 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
@@ -703,6 +703,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
index cd9da18..3192add 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
@@ -715,6 +715,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_tsan2\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_tsan2",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
index 926f781..6602a56 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
@@ -715,6 +715,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_ubsan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_ubsan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
index dfec23a..03b95e7 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
@@ -715,6 +715,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_ubsan_vptr\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_ubsan_vptr",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
index 9e7ad52..ba139a5 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
@@ -688,6 +688,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_x86_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_x86_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
index f012609..10079ce 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
@@ -688,6 +688,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"linux_x86_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "linux_x86_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
index 73c4e28..7c1223e 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
@@ -755,6 +755,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_asan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
index e3b4da9..f49e30b 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
@@ -711,6 +711,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_compile_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_compile_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
index 20ce528..1d76d30 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
@@ -711,6 +711,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_compile_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_compile_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
index f1a0d2f..b7f1899 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
@@ -755,6 +755,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
index f9142e5..23beabe 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
@@ -760,6 +760,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"mac_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "mac_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
index 56fb4a1..00b6d4f 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_asan\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_asan",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_dbg.json
index b7e9550..2b4a48d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_dbg.json
@@ -685,6 +685,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x64_clang_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x64_clang_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_rel.json
index 1d8920a..78a88c0 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_clang_rel.json
@@ -685,6 +685,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x64_clang_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x64_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_dbg.json
index 9b8fc30..00f1e2c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_dbg.json
@@ -658,6 +658,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x64_msvc_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x64_msvc_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_rel.json
index 1e0fa40..4ff50f8 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x64_msvc_rel.json
@@ -658,6 +658,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x64_msvc_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x64_msvc_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_dbg.json
index 9e65573..6422a3f 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_dbg.json
@@ -685,6 +685,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x86_clang_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x86_clang_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_rel.json
index c134782..cc3f2f1 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_clang_rel.json
@@ -685,6 +685,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x86_clang_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x86_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_dbg.json
index 4ac238a..38fe1e6 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_dbg.json
@@ -658,6 +658,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x86_msvc_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x86_msvc_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_rel.json
index e91ec34..be0218c 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_compile_x86_msvc_rel.json
@@ -658,6 +658,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_compile_x86_msvc_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_compile_x86_msvc_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
index a8f3840..58010a9 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_clang_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_clang_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
index cef1484..4c4c00e 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_clang_dbg_win10\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_clang_dbg_win10",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
index e7698fd..4e0764e 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_clang_dbg_win8\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_clang_dbg_win8",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
index 3432cdb..320c554 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_clang_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
index 6dbcfd9..148efab 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_msvc_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_msvc_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
index aa3b2bf..f2f6d30 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_msvc_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_msvc_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_uwp.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_uwp.json
index 815b096..fb173d4 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_uwp.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_uwp.json
@@ -685,6 +685,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x64_uwp\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x64_uwp",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
index 7f22c24..9617cdb 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
@@ -729,6 +729,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_clang_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_clang_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
index 10a83be..fb99a5d 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
@@ -739,6 +739,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_clang_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_clang_rel",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
index 86a9281..9a38b86 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
@@ -702,6 +702,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_msvc_dbg\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_msvc_dbg",
       "--buildbot-mastername",
diff --git a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
index 42c88d6..86fd125 100644
--- a/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
+++ b/recipes/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
@@ -707,6 +707,7 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"win_x86_msvc_rel\", \"project\": \"webrtc\"}",
+      "--is-luci",
       "--buildbot-buildername",
       "win_x86_msvc_rel",
       "--buildbot-mastername",
diff --git a/recipes/upload_goma_logs.py b/recipes/upload_goma_logs.py
index fed1be7..c7faa43 100644
--- a/recipes/upload_goma_logs.py
+++ b/recipes/upload_goma_logs.py
@@ -140,6 +140,9 @@
 
   # From Runtime API.
   parser.add_argument(
+      '--is-luci', action='store_true', help='True if this runs on LUCI'
+  )
+  parser.add_argument(
       '--is-experimental', action='store_true', help='True if experimental'
   )
 
@@ -164,6 +167,7 @@
         master=args.buildbot_mastername,
         slave=args.buildbot_slavename,
         builder_id=builder_id,
+        is_luci=args.is_luci,
         is_experimental=args.is_experimental,
         override_gsutil=override_gsutil
     )
@@ -210,6 +214,7 @@
         master=args.buildbot_mastername,
         slave=args.buildbot_slavename,
         builder_id=builder_id,
+        is_luci=args.is_luci
     )
     if counter:
       tsmon_counters.append(counter)
@@ -227,6 +232,7 @@
         master=args.buildbot_mastername,
         slave=args.buildbot_slavename,
         builder_id=builder_id,
+        is_luci=args.is_luci
     )
     if counter:
       tsmon_counters.append(counter)
@@ -238,6 +244,7 @@
         master=args.buildbot_mastername,
         slave=args.buildbot_slavename,
         builder_id=builder_id,
+        is_luci=args.is_luci
     )
     if counter:
       tsmon_counters.append(counter)