commit b4eba248e0211ce00e37ea867feb76758ebbba76
author Mike Nichols <mikenichols@chromium.org> Fri Sep 27 11:14:21 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Sep 27 20:04:02 2019 +0000
tree d49cbd376b32964a1388cbb2fc59bf6b7bca99e1
parent bb33025aaa928fed863df717937eb9a73100029b

commands: Set default skylab timeout

As a quick, temporary workaround, set the default timeout for skylab
requests to 2 hours.  This will resolve the immediate P0 but should be
removed once it is determined the proper place to set it in config.

BUG=chromium:1008919
TEST='cros_sdk -- /mnt/host/source/chromite/run_tests'

Change-Id: I7a3b22bdef8013d7ca7f99de70985eee00d31d4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1829957
Tested-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
(cherry picked from commit b04334392d997af0a0aae652e4394d73857fd34c)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1829967
Commit-Queue: Mike Nichols <mikenichols@chromium.org>

cbuildbot/commands.py

diff --git a/cbuildbot/commands.py b/cbuildbot/commands.py
index 5f57d45..9d25a25 100644
--- a/cbuildbot/commands.py
+++ b/cbuildbot/commands.py
@@ -1302,14 +1302,15 @@
 
   return args + [test_name]
 
-
+# TODO(crbug.com/1008919): Remove 120 default once config is properly set
+# with default timeouts.
 def RunSkylabHWTest(build,
                     pool,
                     test_name,
                     shown_test_name=None,
                     board=None,
                     model=None,
-                    timeout_mins=None,
+                    timeout_mins=120,
                     tags=None,
                     keyvals=None,
                     test_args=None):
@@ -1377,7 +1378,7 @@
     pool=None,
     wait_for_results=False,
     priority=None,
-    timeout_mins=None,
+    timeout_mins=120,
     # TODO(akeshet): Delete this ignored argument.
     retry=None,
     max_retries=None,
@@ -1472,7 +1473,7 @@
                         pool=None,
                         board=None,
                         model=None,
-                        timeout_mins=None,
+                        timeout_mins=120,
                         tags=None,
                         keyvals=None):
   """Run a skylab test in the Autotest lab using skylab tool.

cbuildbot/commands_unittest.py

diff --git a/cbuildbot/commands_unittest.py b/cbuildbot/commands_unittest.py
index f118db7..b5743cc 100644
--- a/cbuildbot/commands_unittest.py
+++ b/cbuildbot/commands_unittest.py
@@ -292,7 +292,8 @@
         wait_cmd, output=self._fakeWaitJson('COMPLETED', False))
 
     result = commands.RunSkylabHWTestSuite(
-        build, suite, board, pool=pool, wait_for_results=True)
+        build, suite, board, pool=pool, timeout_mins=None,
+        wait_for_results=True)
     self.assertEqual(result.to_raise, None)
     self.assertEqual(result.json_dump_result, None)
 
@@ -328,7 +329,8 @@
     self.rc.AddCmdResult(wait_cmd, output=self._fakeWaitJson('COMPLETED', True))
 
     result = commands.RunSkylabHWTestSuite(
-        build, suite, board, pool=pool, wait_for_results=True)
+        build, suite, board, pool=pool, timeout_mins=None,
+        wait_for_results=True)
     error = result.to_raise
     self.assertTrue(isinstance(error, failures_lib.TestFailure))
     self.assertTrue('Suite failed' in error.message)