diff options
| author | Caroline Tice <cmtice@google.com> | 2016-07-25 11:47:58 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-25 15:05:17 -0700 |
| commit | 0ded515f8f340188634bd8d14e3184b98e4f06de (patch) | |
| tree | 3782bb641426adfa4d69163b84a115de54b8bb05 | |
| parent | 180fb3868ae7a625cd82427ad29bc6224504c757 (diff) | |
| download | toolchain-utils-0ded515f8f340188634bd8d14e3184b98e4f06de.tar.gz | |
[crosperf] Change flags to cbuildbot.
The command for cbuildbot it buildbot_utils had hardcoded the
'--notests' options; this was right for the normal nightly jobs, but
not for the rotating tests. This CL makes that option a variable, and
also allows for users to be able to add other custom flags to their
cbuildbot invocations.
BUG=chromium:631149
TEST=none
Change-Id: Ifd2abd42808d99a28c3f7860f67a2eb2c9cd0118
Reviewed-on: https://chrome-internal-review.googlesource.com/271005
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
| -rwxr-xr-x | buildbot_test_llvm.py | 1 | ||||
| -rwxr-xr-x | buildbot_test_toolchains.py | 1 | ||||
| -rw-r--r-- | cros_utils/buildbot_utils.py | 9 |
3 files changed, 9 insertions, 2 deletions
diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py index 6df77189..2c8131e5 100755 --- a/buildbot_test_llvm.py +++ b/buildbot_test_llvm.py @@ -129,6 +129,7 @@ class ToolchainVerifier(object): self._build, self._patches, description, + other_flags=['--hwtest'], build_toolchain=True) if len(trybot_image) == 0: self._l.LogError('Unable to find trybot_image for %s!' % description) diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 1535afde..b9f6c500 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -296,6 +296,7 @@ class ToolchainComparator(object): self._build, self._patches, description, + other_flags=['--notests'], build_toolchain=True) if len(trybot_image) == 0: diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index a80b7ad4..a3813fa5 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -177,6 +177,7 @@ def GetTrybotImage(chromeos_root, buildbot_name, patch_list, build_tag, + other_flags=[], build_toolchain=False): """Launch buildbot and get resulting trybot artifact name. @@ -208,13 +209,17 @@ def GetTrybotImage(chromeos_root, if build_toolchain: toolchain_flags += '--latest-toolchain' os.chdir(cbuildbot_path) + if other_flags: + optional_flags = ' '.join(other_flags) + else: + optional_flags = '' # Launch buildbot with appropriate flags. build = buildbot_name description = build_tag - command = ('./cbuildbot --remote --nochromesdk --notests' + command = ('./cbuildbot --remote --nochromesdk %s' ' --remote-description=%s %s %s %s' % - (description, toolchain_flags, patch_arg, build)) + (optional_flags, description, toolchain_flags, patch_arg, build)) _, out, _ = ce.RunCommandWOutput(command) if 'Tryjob submitted!' not in out: logger.GetLogger().LogFatal('Error occurred while launching trybot job: ' |