diff --git a/src/tests/ftest/aggregation/dfuse_space_check.yaml b/src/tests/ftest/aggregation/dfuse_space_check.yaml index 47ae21d4de5..dc8e9013174 100644 --- a/src/tests/ftest/aggregation/dfuse_space_check.yaml +++ b/src/tests/ftest/aggregation/dfuse_space_check.yaml @@ -1,5 +1,3 @@ -server_manager: - srv_timeout: 500 hosts: test_servers: 1 test_clients: 1 @@ -14,7 +12,6 @@ server_config: pool: scm_size: 200MB nvme_size: 1GiB # Minimum for 1 target - svcn: 1 container: type: POSIX control_method: daos diff --git a/src/tests/ftest/dfuse/sparse_file.yaml b/src/tests/ftest/dfuse/sparse_file.yaml index 0e77acfe41a..5b30160a012 100644 --- a/src/tests/ftest/dfuse/sparse_file.yaml +++ b/src/tests/ftest/dfuse/sparse_file.yaml @@ -1,5 +1,3 @@ -server_manager: - srv_timeout: 500 hosts: test_servers: 1 test_clients: 1 @@ -14,7 +12,6 @@ server_config: pool: scm_size: 200000000 nvme_size: 1073741824 - svcn: 1 container: type: POSIX control_method: daos diff --git a/src/tests/ftest/osa/offline_drain.yaml b/src/tests/ftest/osa/offline_drain.yaml index 5e4651e499f..a8776edd4a4 100644 --- a/src/tests/ftest/osa/offline_drain.yaml +++ b/src/tests/ftest/osa/offline_drain.yaml @@ -1,5 +1,3 @@ -server_manager: - srv_timeout: 500 hosts: test_servers: 3 test_clients: 1 @@ -35,7 +33,6 @@ pool: scm_size: 12000000000 nvme_size: 108000000000 svcn: 4 - control_method: dmg rebuild_timeout: 240 properties: scrub:timed container: diff --git a/src/tests/ftest/osa/offline_parallel_test.yaml b/src/tests/ftest/osa/offline_parallel_test.yaml index 4f0af968d3a..e8dd4563339 100644 --- a/src/tests/ftest/osa/offline_parallel_test.yaml +++ b/src/tests/ftest/osa/offline_parallel_test.yaml @@ -1,5 +1,3 @@ -server_manager: - srv_timeout: 500 hosts: test_servers: server-[1-2] test_clients: 1 @@ -37,7 +35,6 @@ pool: scm_size: 6000000000 nvme_size: 54000000000 svcn: 4 - control_method: dmg container: type: POSIX control_method: daos diff --git a/src/tests/ftest/osa/online_drain.yaml b/src/tests/ftest/osa/online_drain.yaml index 335f9967f22..ea59572d8f4 100644 --- a/src/tests/ftest/osa/online_drain.yaml +++ b/src/tests/ftest/osa/online_drain.yaml @@ -1,5 +1,3 @@ -server_manager: - srv_timeout: 500 hosts: test_servers: 3 test_clients: 1 diff --git a/src/tests/ftest/util/yaml_utils.py b/src/tests/ftest/util/yaml_utils.py index 1bb969e4049..c5a21847881 100644 --- a/src/tests/ftest/util/yaml_utils.py +++ b/src/tests/ftest/util/yaml_utils.py @@ -1,5 +1,5 @@ """ -(C) Copyright 2020-2023 Intel Corporation. +(C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -87,7 +87,6 @@ class YamlUpdater(): ("pool_query_timeout", "_timeout", int), ("pool_query_delay", "_timeout", int), ("rebuild_timeout", "_timeout", int), - ("srv_timeout", "_timeout", int), ("storage_prepare_timeout", "_timeout", int), ("storage_format_timeout", "_timeout", int), ]