aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2022-02-24 15:32:24 -0800
committerCommit Bot <commit-bot@chromium.org>2022-02-25 01:39:24 +0000
commit56465d5c8a1745abcf6d5da395e8958b5df18b75 (patch)
tree9832670513f2fc9cd8f41e899fbeb1eb960b197c
parentf07561c3e22d1199f44519d614eb2241efb0be3c (diff)
downloadtoolchain-utils-56465d5c8a1745abcf6d5da395e8958b5df18b75.tar.gz
command_executer: extend timeout for first-time SDK entry
As noted in the comment, this can sometimes be an operation that takes quite a while. This is WAI. BUG=b:221302420 TEST=Unittests Change-Id: I21a18713d050b21c593caf2fde69b91e2ffd7c8e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3489849 Tested-by: George Burgess <gbiv@chromium.org> Auto-Submit: George Burgess <gbiv@chromium.org> Reviewed-by: Manoj Gupta <manojgupta@chromium.org> Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
-rwxr-xr-xcros_utils/command_executer.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/cros_utils/command_executer.py b/cros_utils/command_executer.py
index 0bf89d4d..cc0f3372 100755
--- a/cros_utils/command_executer.py
+++ b/cros_utils/command_executer.py
@@ -393,7 +393,11 @@ class CommandExecuter(object):
if return_output:
ret = self.RunCommand(
'cd %s; cros_sdk %s -- true' % (chromeos_root, cros_sdk_options),
- env=env)
+ env=env,
+ # Give this command a long time to execute; it might involve setting
+ # the chroot up, or running fstrim on its image file. Both of these
+ # operations can take well over the timeout default of 10 seconds.
+ terminated_timeout=5 * 60)
if ret:
return (ret, '', '')