diff options
| -rwxr-xr-x | buildbot_test_toolchains.py | 3 | ||||
| -rw-r--r-- | cros_utils/buildbot_utils.py | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 5f65e15a..36c9d87e 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -254,13 +254,12 @@ class ToolchainComparator(object): date_str = datetime.date.today() description = 'master_%s_%s_%s' % (self._patches_string, self._build, date_str) - # TODO(laszio): move --notests to tryjob_flags once it is available. build_id, trybot_image = buildbot_utils.GetTrybotImage( self._chromeos_root, self._build, self._patches, description, - cbuildbot_flags=['--notests'], + tryjob_flags=['--notests'], build_toolchain=True) print('trybot_url: \ 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: ' |