diff options
| author | Yunlian Jiang <yunlian@google.com> | 2017-11-21 04:48:40 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-21 16:37:13 -0800 |
| commit | 73580dd787829a4baf7039e5cf2c8d47439843a9 (patch) | |
| tree | 6ade04d97c94280819fe95dbb4aacd83f6e3f6a1 | |
| parent | 9c4003a995ec910718bed777efe9ecb893d71ef9 (diff) | |
| download | toolchain-utils-73580dd787829a4baf7039e5cf2c8d47439843a9.tar.gz | |
Add '-tryjob' suffix to build name.
We got some errors like
These configs are not tryjob safe:
lumpy-release
Consider these configs instead:
lumpy-release-tryjob
when lauching tryjobs to get the image.
This CL fixes that.
BUG=none
TEST=the build name is set to lumpy-release-tryjob.
Change-Id: I30086001e3937c956983f7c31b038b4a09b3ecec
Reviewed-on: https://chromium-review.googlesource.com/781441
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
| -rwxr-xr-x | buildbot_test_toolchains.py | 6 | ||||
| -rw-r--r-- | cros_utils/buildbot_utils.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 1889aa98..a274cc5c 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -71,7 +71,7 @@ class ToolchainComparator(object): self._base_dir = os.getcwd() self._ce = command_executer.GetCommandExecuter() self._l = logger.GetLogger() - self._build = '%s-release' % board + self._build = '%s-release-tryjob' % board self._patches = patches.split(',') if patches else [] self._patches_string = '_'.join(str(p) for p in self._patches) self._noschedv2 = noschedv2 @@ -92,7 +92,7 @@ class ToolchainComparator(object): Args: trybot_image: artifact name such as - 'trybot-daisy-release/R40-6394.0.0-b1389' + 'trybot-daisy-release-tryjob/R40-6394.0.0-b1389' Returns: Latest official image name, e.g. 'daisy-release/R57-9089.0.0'. @@ -115,7 +115,7 @@ class ToolchainComparator(object): Args: trybot_image: artifact name such as - 'trybot-daisy-release/R40-6394.0.0-b1389' + 'trybot-daisy-release-tryjob/R40-6394.0.0-b1389' Returns: Corresponding chrome PFQ image name, e.g. diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 51841545..286c3c9f 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -107,7 +107,7 @@ def GetBuildInfo(file_dir, waterfall_builder): """Get all the build records for the trybot builds.""" builder = '' - if waterfall_builder.endswith('-release'): + if waterfall_builder.endswith('-release-tryjob'): builder = 'release' elif waterfall_builder.endswith('-gcc-toolchain'): builder = 'gcc_toolchain' |