summaryrefslogtreecommitdiff
path: root/buildscripts/evergreen_generate_resmoke_tasks.py
diff options
context:
space:
mode:
authorDavid Bradford <david.bradford@mongodb.com>2020-03-23 13:26:57 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-03-24 15:10:53 +0000
commit763d7bb2d1da2ad8e790775f9757d39064bb686a (patch)
treeb276cd9f2d7731d5df4e0acc9dfc806716ad7a87 /buildscripts/evergreen_generate_resmoke_tasks.py
parentaef2f4f5c62fe07842bbc861dddcb0ad2f9a9e16 (diff)
downloadmongo-763d7bb2d1da2ad8e790775f9757d39064bb686a.tar.gz
SERVER-47054: Don't fail due to long timeout values on mainline builds
(cherry picked from commit 8f32ba76afa83456e47aefe683ce55b3da0dbdae)
Diffstat (limited to 'buildscripts/evergreen_generate_resmoke_tasks.py')
-rwxr-xr-xbuildscripts/evergreen_generate_resmoke_tasks.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py
index 1f729bc271d..0f9996de01f 100755
--- a/buildscripts/evergreen_generate_resmoke_tasks.py
+++ b/buildscripts/evergreen_generate_resmoke_tasks.py
@@ -622,7 +622,8 @@ class EvergreenConfigGenerator(object):
LOGGER.debug("Setting exec_timeout", exec_timeout=exec_timeout,
suite_runtime=expected_suite_runtime, factor=repeat_factor)
- if timeout > MAX_EXPECTED_TIMEOUT or exec_timeout > MAX_EXPECTED_TIMEOUT:
+ if self.options.is_patch and \
+ (timeout > MAX_EXPECTED_TIMEOUT or exec_timeout > MAX_EXPECTED_TIMEOUT):
frameinfo = getframeinfo(currentframe())
LOGGER.error(
"This task looks like it is expected to run far longer than normal. This is "