diff options
| author | Ting-Yuan Huang <laszio@chromium.org> | 2017-08-18 16:55:02 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-18 20:11:19 -0700 |
| commit | 0da40e061f617fbc13afa7986b386e0ed1e25810 (patch) | |
| tree | 6d5768aa3e420ca65a3e87b6ed675b94a92418ef /cros_utils/buildbot_utils.py | |
| parent | 4f59a62546caa30051ac7c9a93c49069f7741245 (diff) | |
| download | toolchain-utils-0da40e061f617fbc13afa7986b386e0ed1e25810.tar.gz | |
Move cbuildbot flags to tryjob flags
They are now available and needn't to be pass through.
BUG=chromium:756100
TEST=buildbot_test_toolchains.py
Change-Id: Icece6e74faa8966067346a3a5fc111c9fdb5e431
Reviewed-on: https://chromium-review.googlesource.com/622309
Commit-Ready: Ting-Yuan Huang <laszio@chromium.org>
Tested-by: Ting-Yuan Huang <laszio@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Diffstat (limited to 'cros_utils/buildbot_utils.py')
| -rw-r--r-- | cros_utils/buildbot_utils.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 0d524883..ae707eae 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -200,7 +200,6 @@ def GetTrybotImage(chromeos_root, patch_list, build_tag, tryjob_flags=[], - cbuildbot_flags=[], build_toolchain=False, async=False): """Launch buildbot and get resulting trybot artifact name. @@ -226,8 +225,6 @@ def GetTrybotImage(chromeos_root, prebuilt one in SDK. tryjob_flags See cros tryjob --help for available options. - - cbuildbot_flags See cbuildbot --help for available options. """ ce = command_executer.GetCommandExecuter() base_dir = os.getcwd() @@ -237,18 +234,16 @@ def GetTrybotImage(chromeos_root, patch_arg = patch_arg + ' -g ' + repr(p) toolchain_flags = '' if build_toolchain: - cbuildbot_flags.append('--latest-toolchain') + tryjob_flags.append('--latest-toolchain') os.chdir(chromeos_root) tryjob_flags = ' '.join(tryjob_flags) - cbuildbot_flags = ' '.join(cbuildbot_flags) # Launch buildbot with appropriate flags. build = buildbot_name description = build_tag - command = ('cros tryjob --yes %s --remote-description %s' - ' %s %s --passthrough --nochromesdk %s' % - (tryjob_flags, description, - patch_arg, build, cbuildbot_flags)) + command = ('cros tryjob --yes --nochromesdk --remote-description %s' + ' %s %s %s' % + (description, tryjob_flags, patch_arg, build)) _, out, _ = ce.RunCommandWOutput(command) if 'Tryjob submitted!' not in out: logger.GetLogger().LogFatal('Error occurred while launching trybot job: ' |