commit fbbccec70e97d1679475eb6936c28e04da28002a
author Don Garrett <dgarrett@google.com> Wed Sep 20 14:04:48 2017 -0700
committer Don Garrett <dgarrett@chromium.org> Wed Sep 20 22:17:48 2017 +0000
tree 5fca36e617aa6c6f7721010fe0b65da4189ffffb
parent ee5fcabe72770448146219d9fada92d1496f3a6f

cbuildbot_launch: Respect --no-buildbot-tags.

When running a nested build, cbuildbot_launch was still generating
stage tags, despite --no-buildbot-tags being set, which causes the
buildbot output to be confusing. Stop doing that.

BUG=chromium:764999
TEST=run_tests -q

Change-Id: I0732040611c1c9cdc47d59a4aafc9ce832030c52
Reviewed-on: https://chromium-review.googlesource.com/676183
Tested-by: Don Garrett <dgarrett@chromium.org>
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>

scripts/cbuildbot_launch.py

diff --git a/scripts/cbuildbot_launch.py b/scripts/cbuildbot_launch.py
index cb132c4..bc56a44 100644
--- a/scripts/cbuildbot_launch.py
+++ b/scripts/cbuildbot_launch.py
@@ -332,7 +332,8 @@
 
     # Preliminary set, mostly command line parsing.
     with metrics.SuccessCounter(METRIC_INVOKED, metrics_fields):
-      logging.EnableBuildbotMarkers()
+      if options.enable_buildbot_tags:
+        logging.EnableBuildbotMarkers()
       ConfigureGlobalEnvironment()
 
     # Prepare the buildroot with source for the build.