diff options
| author | Caroline Tice <cmtice@google.com> | 2017-04-14 10:16:14 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-04-14 12:25:28 -0700 |
| commit | 466c45d752af98dae774ecd85c1b07349c292cd9 (patch) | |
| tree | 4eab4dc7c5962557150565599df31ed085dc71ce | |
| parent | 3f17e3d5880b0b8cd328b08b0e793783264e125a (diff) | |
| download | toolchain-utils-466c45d752af98dae774ecd85c1b07349c292cd9.tar.gz | |
[toolchain-utils] Remove --do-not-use-buildbucket flag
This implements the correct way to find the remote description so
that we do not need to disable the buildbucket authentication.
BUG=chromium:711430
TEST=Launched nightly buildbot job and it was able to find correct
build log.
Change-Id: I0a2e16ec284bae46af684daf3abcbbea1b9c3fe9
Reviewed-on: https://chromium-review.googlesource.com/478010
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>
| -rw-r--r-- | cros_utils/buildbot_utils.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 00010523..d24ba0d3 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -91,8 +91,14 @@ def FindBuildRecordFromLog(description, build_info): point.) """ for build_log in build_info: - if description in build_log['reason']: - return build_log + property_list = build_log['properties'] + for prop in property_list: + if len(prop) < 2: + continue + pname = prop[0] + pvalue = prop[1] + if pname == 'name' and pvalue == description: + return build_log return {} @@ -236,7 +242,7 @@ def GetTrybotImage(chromeos_root, command_prefix = '' if not patch_arg: command_prefix = 'yes | ' - command = ('%s ./cbuildbot --remote --nochromesdk --do-not-use-buildbucket %s' + command = ('%s ./cbuildbot --remote --nochromesdk %s' ' --remote-description=%s %s %s %s' % (command_prefix, optional_flags, description, toolchain_flags, patch_arg, build)) |