diff options
| author | Caroline Tice <cmtice@google.com> | 2016-10-27 10:18:24 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-27 15:30:39 -0700 |
| commit | 6c438e04d12f5dd94dd060c9ab41a61766dc313e (patch) | |
| tree | c1ad6fbd79a8472fb025ff40c09f07755c3340c6 /cros_utils/buildbot_utils.py | |
| parent | e82513b0aec27bf5d3ca51789edc48dde5ee439b (diff) | |
| download | toolchain-utils-6c438e04d12f5dd94dd060c9ab41a61766dc313e.tar.gz | |
[crosperf] Fix buildbot_utils for rotating tester waterfall.
The rotating testers trybot waterfall location has moved. This CL
updates the script to look for their build logs in the correct
builder location. It also makes sure we don't crash/die because
their build status is non-zero (ie. a HWTest failed). This also fixes
a tiny bug in the results reporting.
BUG=chromium:660085
TEST=Tested in the role account.
Change-Id: I396ec0ad588e54e88bc44dcc0e72eda45d077173
Reviewed-on: https://chrome-internal-review.googlesource.com/300598
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Diffstat (limited to 'cros_utils/buildbot_utils.py')
| -rw-r--r-- | cros_utils/buildbot_utils.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 684af5f4..a0caeefc 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -124,6 +124,10 @@ def GetBuildInfo(file_dir, builder): # For release builds, get logs from the 'release' builder. if builder.endswith('-release'): commands += ' -b release' + elif builder.endswith('-gcc-toolchain'): + commands += ' -b gcc_toolchain' + elif builder.endswith('-llvm-toolchain'): + commands += ' -b llvm_toolchain' elif builder.endswith('-toolchain'): commands += ' -b etc' else: @@ -300,8 +304,16 @@ def GetTrybotImage(chromeos_root, trybot_image = '' - if build_status in OK_STATUS: + if build.endswith('-toolchain'): + # For rotating testers, we don't care about their build_status + # result, because if any HWTest failed it will be non-zero. trybot_image = FindArchiveImage(chromeos_root, build, build_id) + else: + # The nightly performance tests do not run HWTests, so if + # their build_status is non-zero, we do care. In this case + # non-zero means the image itself probably did not build. + if build_status in OK_STATUS: + trybot_image = FindArchiveImage(chromeos_root, build, build_id) if not trybot_image: logger.GetLogger().LogError('Trybot job %s failed with status %d;' ' no trybot image generated.' % |