diff options
| author | Prathmesh Prabhu <pprabhu@chromium.org> | 2015-07-17 15:11:49 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-18 02:23:19 +0000 |
| commit | 51d774f4cc0126e3577729079d69f402a370948f (patch) | |
| tree | b0edd2a3e0006df82d13513fd6fe1e49aaa64e22 /scripts | |
| parent | 17f0742270498c9ce88af2e61027caca0307ee78 (diff) | |
| download | chromite-51d774f4cc0126e3577729079d69f402a370948f.tar.gz | |
cbuildbot: Add option --no-buildbot-tags to suppress buildbot tags.
CL:286532 added a knob to suppress tags used by buildbot from the logs.
This CL uses the knob to suppress these tags in a recursive cbuildbot
run inside the BranchUtilTestStage. Before this CL, the stages from the
test run would show up on the waterfall's landing page along with the
main build's steps. This was confusing.
BUG=chromium:510905
TEST=`cbuildbot --local --noreexec --nobootstrap binhost-pre-cq`
`cbuildbot --local --noreexec --nobootstrap --no-buildbot-tags \
binhost-pre-cq`
The first run shows buildbot friendly logs, while the second
doesn't.
Change-Id: Ib2638f67a07094aa1af9994590739ffab8e04dfd
Reviewed-on: https://chromium-review.googlesource.com/286546
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cbuildbot.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py index b604b9377..4365d9f6c 100644 --- a/scripts/cbuildbot.py +++ b/scripts/cbuildbot.py @@ -520,6 +520,11 @@ def _CreateParser(): 'to skip verification by the bootstrap code')) group.add_remote_option('--buildbot', dest='buildbot', action='store_true', default=False, help='This is running on a buildbot') + group.add_remote_option('--no-buildbot-tags', action='store_false', + dest='enable_buildbot_tags', default=True, + help='Suppress buildbot specific tags from log ' + 'output. This is used to hide recursive ' + 'cbuilbot runs on the waterfall.') group.add_remote_option('--buildnumber', help='build number', type='int', default=0) group.add_option('--chrome_root', default=None, type='path', @@ -1078,7 +1083,8 @@ def main(argv): cros_build_lib.AssertOutsideChroot() - logging.EnableBuildbotMarkers() + if options.enable_buildbot_tags: + logging.EnableBuildbotMarkers() if options.remote: logging.getLogger().setLevel(logging.WARNING) |