From f763d91e62e9a3099be2bf55103ca40c942672b8 Mon Sep 17 00:00:00 2001 From: Caroline Tice Date: Mon, 16 Apr 2018 11:51:50 -0700 Subject: [toolchain-utils] Remove --remote-description flag. The cros tryjob command no longer recognizes this flag so we need to remove it from our scripts. BUG=chromium:833542 TEST=Tested with launching the rotating builders on chrotomation2. Change-Id: Ifcf62ae7073d84a9f58e12c29dcce5cdf9108e9f Reviewed-on: https://chromium-review.googlesource.com/1014369 Commit-Ready: Caroline Tice Tested-by: Caroline Tice Reviewed-by: Manoj Gupta --- cros_utils/buildbot_utils.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'cros_utils/buildbot_utils.py') diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 7b8f1008..29bed72a 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -80,7 +80,6 @@ def ParseTryjobBuildbucketId(msg): def SubmitTryjob(chromeos_root, buildbot_name, patch_list, - build_tag, tryjob_flags=None, build_toolchain=False): """Calls `cros tryjob ...` @@ -91,8 +90,6 @@ def SubmitTryjob(chromeos_root, buildbot_name: the name of the buildbot queue, such as lumpy-release or daisy-paladin. patch_list: a python list of the patches, if any, for the buildbot to use. - build_tag: a (unique) string to be used to look up the buildbot results - from among all the build records. tryjob_flags: See cros tryjob --help for available options. build_toolchain: builds and uses the latest toolchain, rather than the prebuilt one in SDK. @@ -112,9 +109,8 @@ def SubmitTryjob(chromeos_root, # Launch buildbot with appropriate flags. build = buildbot_name - description = build_tag - command = ('cros tryjob --yes --json --nochromesdk --remote-description %s' - ' %s %s %s' % (description, tryjob_flags, patch_arg, build)) + command = ('cros tryjob --yes --json --nochromesdk %s %s %s' % + (tryjob_flags, patch_arg, build)) print('CMD: %s' % command) _, out, _ = RunCommandInPath(chromeos_root, command) buildbucket_id = ParseTryjobBuildbucketId(out) @@ -128,7 +124,6 @@ def SubmitTryjob(chromeos_root, def GetTrybotImage(chromeos_root, buildbot_name, patch_list, - build_tag, tryjob_flags=None, build_toolchain=False, async=False): @@ -146,8 +141,6 @@ def GetTrybotImage(chromeos_root, buildbot_name: the name of the buildbot queue, such as lumpy-release or daisy-paladin. patch_list: a python list of the patches, if any, for the buildbot to use. - build_tag: a (unique) string to be used to look up the buildbot results - from among all the build records. tryjob_flags: See cros tryjob --help for available options. build_toolchain: builds and uses the latest toolchain, rather than the prebuilt one in SDK. @@ -158,7 +151,7 @@ def GetTrybotImage(chromeos_root, (8952271933586980528, trybot-elm-release-tryjob/R67-10480.0.0-b2373596) """ buildbucket_id = SubmitTryjob(chromeos_root, buildbot_name, patch_list, - build_tag, tryjob_flags, build_toolchain) + tryjob_flags, build_toolchain) if async: return buildbucket_id, ' ' -- cgit v1.2.3