diff options
| author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2023-02-20 10:06:36 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-20 10:56:08 +0000 |
| commit | 73d0f845e05e52c882bfc8e45d6e6758b7a6761d (patch) | |
| tree | 7028836a632757943bce35353935ac810ebbaaea /buildscripts | |
| parent | afb0f1ac441d9f1bd3b5a9c35dabd25c9133c93a (diff) | |
| download | mongo-73d0f845e05e52c882bfc8e45d6e6758b7a6761d.tar.gz | |
SERVER-73707 Evergreen timeout calculation fixes and cleanups
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/evergreen_task_timeout.py | 22 | ||||
| -rw-r--r-- | buildscripts/timeouts/timeout_service.py | 8 |
2 files changed, 14 insertions, 16 deletions
diff --git a/buildscripts/evergreen_task_timeout.py b/buildscripts/evergreen_task_timeout.py index 9eb56eb23fa..6c51cf79b7b 100755 --- a/buildscripts/evergreen_task_timeout.py +++ b/buildscripts/evergreen_task_timeout.py @@ -28,20 +28,21 @@ DEFAULT_TIMEOUT_OVERRIDES = "etc/evergreen_timeouts.yml" DEFAULT_EVERGREEN_CONFIG = "etc/evergreen.yml" DEFAULT_EVERGREEN_AUTH_CONFIG = "~/.evergreen.yml" COMMIT_QUEUE_ALIAS = "__commit_queue" -UNITTEST_TASK = "run_unittests" IGNORED_SUITES = { - "integration_tests_replset", "integration_tests_replset_ssl_auth", "integration_tests_sharded", - "integration_tests_standalone", "integration_tests_standalone_audit", "mongos_test", - "server_selection_json_test" + "integration_tests_replset", + "integration_tests_replset_ssl_auth", + "integration_tests_sharded", + "integration_tests_standalone", + "integration_tests_standalone_audit", + "mongos_test", + "server_selection_json_test", + "sdam_json_test", } HISTORY_LOOKBACK = timedelta(weeks=2) -COMMIT_QUEUE_TIMEOUT = timedelta(minutes=40) +COMMIT_QUEUE_TIMEOUT = timedelta(minutes=20) DEFAULT_REQUIRED_BUILD_TIMEOUT = timedelta(hours=1, minutes=20) DEFAULT_NON_REQUIRED_BUILD_TIMEOUT = timedelta(hours=2) -# 2x the longest "run tests" phase for unittests as of c9bf1dbc9cc46e497b2f12b2d6685ef7348b0726, -# which is 5 mins 47 secs, excluding outliers below -UNITTESTS_TIMEOUT = timedelta(minutes=12) class TimeoutOverride(BaseModel): @@ -225,11 +226,6 @@ class TaskTimeoutOrchestrator: LOGGER.info("Overriding configured timeout", exec_timeout_secs=override.total_seconds()) determined_timeout = override - elif task_name == UNITTEST_TASK and override is None: - LOGGER.info("Overriding unittest timeout", - exec_timeout_secs=UNITTESTS_TIMEOUT.total_seconds()) - determined_timeout = UNITTESTS_TIMEOUT - elif _is_required_build_variant( variant) and determined_timeout > DEFAULT_REQUIRED_BUILD_TIMEOUT: LOGGER.info("Overriding required-builder timeout", diff --git a/buildscripts/timeouts/timeout_service.py b/buildscripts/timeouts/timeout_service.py index 12850fc6ff2..7a329d36cdc 100644 --- a/buildscripts/timeouts/timeout_service.py +++ b/buildscripts/timeouts/timeout_service.py @@ -5,8 +5,7 @@ import inject import structlog from buildscripts.resmoke_proxy.resmoke_proxy import ResmokeProxyService from buildscripts.timeouts.timeout import TimeoutEstimate -from buildscripts.util.teststats import HistoricTaskData -from evergreen import EvergreenApi +from buildscripts.util.teststats import HistoricTaskData, normalize_test_name LOGGER = structlog.get_logger(__name__) CLEAN_EVERY_N_HOOK = "CleanEveryN" @@ -53,7 +52,10 @@ class TimeoutService: if not historic_stats: return TimeoutEstimate.no_timeouts() - test_set = set(self.resmoke_proxy.list_tests(timeout_params.suite_name)) + test_set = { + normalize_test_name(test) + for test in self.resmoke_proxy.list_tests(timeout_params.suite_name) + } test_runtimes = [ stat for stat in historic_stats.get_tests_runtimes() if stat.test_name in test_set ] |