From ef4b788bb5a1ba47881c73901228a07f5430ad4c Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Tue, 11 Dec 2018 15:44:12 +0000 Subject: Revert "[toolchain-utils] Add tryjob flags to build Chrome from 9999 ebuild." This reverts commit 115acfa5fc88d4aa4eb9158e41be534439952a33. Reason for revert: No need to test chrome 9999 ebuild anymore. Original change's description: > [toolchain-utils] Add tryjob flags to build Chrome from 9999 ebuild. > > This CL updates the nightly tryjobs to build Chrome using the > 9999 ebuild, to work with the CL that updates Chrome to not use > ThinLTO caching, so we can test LLD with our nightly builders. > > BUG=None > TEST=Tested a tryjob with those flags and that CL, and it worked. > > Change-Id: I3b1e77de6d1ead54f1696dc49987a37dd8db50ad > Reviewed-on: https://chromium-review.googlesource.com/1345889 > Commit-Ready: Caroline Tice > Tested-by: Caroline Tice > Reviewed-by: Manoj Gupta Bug: chromium:701659 Change-Id: I1138ed7ed0dd23103f6202140f4eb5385ae567b4 Reviewed-on: https://chromium-review.googlesource.com/1372264 Commit-Ready: Manoj Gupta Tested-by: Manoj Gupta Reviewed-by: Caroline Tice --- cros_utils/buildbot_utils.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'cros_utils') diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 87be13cb..bfc048ee 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -91,13 +91,13 @@ def SubmitTryjob(chromeos_root, Args: chromeos_root: the path to the ChromeOS root, needed for finding chromite - and launching the buildbot. + and launching the buildbot. buildbot_name: the name of the buildbot queue, such as lumpy-release or - daisy-paladin. + daisy-paladin. patch_list: a python list of the patches, if any, for the buildbot to use. tryjob_flags: See cros tryjob --help for available options. build_toolchain: builds and uses the latest toolchain, rather than the - prebuilt one in SDK. + prebuilt one in SDK. Returns: buildbucket id @@ -114,9 +114,8 @@ def SubmitTryjob(chromeos_root, # Launch buildbot with appropriate flags. build = buildbot_name - command = ( - 'cros tryjob --pass-through=--chrome_rev=tot --yes --json --nochromesdk' - ' %s %s %s' % (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) @@ -143,13 +142,13 @@ def GetTrybotImage(chromeos_root, Args: chromeos_root: the path to the ChromeOS root, needed for finding chromite - and launching the buildbot. + and launching the buildbot. buildbot_name: the name of the buildbot queue, such as lumpy-release or - daisy-paladin. + daisy-paladin. patch_list: a python list of the patches, if any, for the buildbot to use. tryjob_flags: See cros tryjob --help for available options. build_toolchain: builds and uses the latest toolchain, rather than the - prebuilt one in SDK. + prebuilt one in SDK. async: don't wait for artifacts; just return the buildbucket id Returns: -- cgit v1.2.3