diff options
| -rwxr-xr-x | buildbot/cbuildbot_config.py | 3 | ||||
| -rwxr-xr-x | buildbot/cbuildbot_config_unittest.py | 5 | ||||
| -rw-r--r-- | lib/parallel.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/buildbot/cbuildbot_config.py b/buildbot/cbuildbot_config.py index 88970ffc8..536ad72fd 100755 --- a/buildbot/cbuildbot_config.py +++ b/buildbot/cbuildbot_config.py @@ -1812,7 +1812,8 @@ _release = full.derive(official, internal, vm_tests=[constants.SMOKE_SUITE_TEST_TYPE, constants.DEV_MODE_TEST_TYPE, constants.CROS_VM_TEST_TYPE], disk_vm_layout='usb', - hw_tests=HWTestConfig.DefaultList(file_bugs=True), + # Canary hwtest timeout chosen based on the frequency of canary runs. + hw_tests=HWTestConfig.DefaultList(file_bugs=True, timeout=190 * 60), upload_hw_test_artifacts=True, paygen=True, signer_results=True, diff --git a/buildbot/cbuildbot_config_unittest.py b/buildbot/cbuildbot_config_unittest.py index 228cb0d78..4c9e1beab 100755 --- a/buildbot/cbuildbot_config_unittest.py +++ b/buildbot/cbuildbot_config_unittest.py @@ -208,11 +208,12 @@ class CBuildBotTest(cros_test_lib.MoxTestCase): """Verify that hw test timeout is in a reasonable range.""" # The parallel library will kill the process if it's silent for longer # than the silent timeout. - max_timeout = parallel._BackgroundTask.MINIMUM_SILENT_TIMEOUT + max_timeout = parallel._BackgroundTask.SILENT_TIMEOUT for build_name, config in cbuildbot_config.config.iteritems(): for test_config in config['hw_tests']: self.assertTrue(test_config.timeout < max_timeout, - '%s has a hw_tests_timeout that is too large.' % build_name) + '%s has a hw_tests_timeout of %s that is too large. Expected %s' % + (build_name, test_config.timeout, max_timeout)) def testValidUnifiedMasterConfig(self): """Make sure any unified master configurations are valid.""" diff --git a/lib/parallel.py b/lib/parallel.py index b5ef3db7c..49569117e 100644 --- a/lib/parallel.py +++ b/lib/parallel.py @@ -76,7 +76,7 @@ class _BackgroundTask(multiprocessing.Process): # The time we allow processes to be silent. This must be greater than the # hw_test_timeout set in cbuildbot_config.py, and less than the timeout set # by buildbot itself (typically, 150 minutes.) - SILENT_TIMEOUT = 60 * 145 + SILENT_TIMEOUT = 60 * 205 # The amount by which we reduce the SILENT_TIMEOUT every time we launch # a subprocess. This helps ensure that children get a chance to enforce the |