diff options
| -rwxr-xr-x | buildscripts/evergreen_task_timeout.py | 6 | ||||
| -rw-r--r-- | etc/evergreen_timeouts.yml | 8 | ||||
| -rw-r--r-- | evergreen/functions/task_timeout_determine.sh | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/buildscripts/evergreen_task_timeout.py b/buildscripts/evergreen_task_timeout.py index 6c51cf79b7b..5dddfe4516d 100755 --- a/buildscripts/evergreen_task_timeout.py +++ b/buildscripts/evergreen_task_timeout.py @@ -357,6 +357,8 @@ def main(): help="Evergreen project task is being executed on.") parser.add_argument("--evg-alias", dest="evg_alias", required=True, help="Evergreen alias used to trigger build.") + parser.add_argument("--test-flags", dest="test_flags", + help="Test flags that are used for `resmoke.py run` command call.") parser.add_argument("--timeout", dest="timeout", type=int, help="Timeout to use (in sec).") parser.add_argument("--exec-timeout", dest="exec_timeout", type=int, help="Exec timeout to use (in sec).") @@ -393,7 +395,9 @@ def main(): parse_evergreen_file(os.path.expanduser(options.evg_project_config))) binder.bind( ResmokeProxyService, - ResmokeProxyService(run_options=f"--installDir={shlex.quote(options.install_dir)}")) + ResmokeProxyService( + run_options=f"--installDir={shlex.quote(options.install_dir)} {options.test_flags}") + ) inject.configure(dependencies) diff --git a/etc/evergreen_timeouts.yml b/etc/evergreen_timeouts.yml index c86d7644705..ba39b42dfea 100644 --- a/etc/evergreen_timeouts.yml +++ b/etc/evergreen_timeouts.yml @@ -23,10 +23,6 @@ overrides: - task: replica_sets_jscore_passthrough exec_timeout: 150 # 2.5 hours - enterprise-rhel-80-64-bit-coverage: - - task: replica_sets_jscore_passthrough - exec_timeout: 150 # 2.5 hours. - macos: - task: concurrency idle_timeout: 15 @@ -43,10 +39,6 @@ overrides: - task: update_timeseries_fuzzer exec_timeout: 150 # 2.5 hours - rhel80-debug-suggested: - - task: replica_sets_jscore_passthrough - exec_timeout: 180 # 3 hours. - rhel80-debug-ubsan-classic-engine: - task: update_timeseries_fuzzer exec_timeout: 150 # 2.5 hours diff --git a/evergreen/functions/task_timeout_determine.sh b/evergreen/functions/task_timeout_determine.sh index 49dda4dd4a9..b307586792d 100644 --- a/evergreen/functions/task_timeout_determine.sh +++ b/evergreen/functions/task_timeout_determine.sh @@ -31,8 +31,15 @@ else evg_alias="evg-alias-absent" fi +resmoke_test_flags="" +if [[ -n "${test_flags}" ]]; then + resmoke_test_flags="--test-flags='${test_flags}'" +fi + activate_venv -PATH=$PATH:$HOME:/ $python buildscripts/evergreen_task_timeout.py $timeout_factor \ +PATH=$PATH:$HOME:/ eval $python buildscripts/evergreen_task_timeout.py \ + $timeout_factor \ + $resmoke_test_flags \ --install-dir "${install_dir}" \ --task-name ${task_name} \ --suite-name ${suite_name} \ |