diff --git a/src/tests/ftest/recovery/check_policy.py b/src/tests/ftest/recovery/check_policy.py index f5efe9fe957..0ef24dd4c0c 100644 --- a/src/tests/ftest/recovery/check_policy.py +++ b/src/tests/ftest/recovery/check_policy.py @@ -34,7 +34,7 @@ def test_check_policies(self): Jira ID: DAOS-17706 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckPolicyTest,test_check_policies """ diff --git a/src/tests/ftest/recovery/check_policy.yaml b/src/tests/ftest/recovery/check_policy.yaml index 6b9f2a178de..12e26ea6686 100644 --- a/src/tests/ftest/recovery/check_policy.yaml +++ b/src/tests/ftest/recovery/check_policy.yaml @@ -1,19 +1,27 @@ hosts: test_servers: 1 -timeout: 180 +timeout: 5M server_config: name: daos_server - engines_per_host: 1 + engines_per_host: 2 engines: 0: - targets: 1 + fabric_iface: ib0 + fabric_iface_port: 31317 + log_file: daos_server0.log + nr_xs_helpers: 1 + storage: auto + 1: + fabric_iface: ib1 + fabric_iface_port: 31417 + log_file: daos_server1.log + nr_xs_helpers: 1 storage: auto - system_ram_reserved: 1 pool: - size: 5G + size: 60G container: control_method: daos diff --git a/src/tests/ftest/recovery/check_repair.py b/src/tests/ftest/recovery/check_repair.py index a3b914c9dc2..914ce8cb287 100644 --- a/src/tests/ftest/recovery/check_repair.py +++ b/src/tests/ftest/recovery/check_repair.py @@ -30,7 +30,7 @@ def test_check_repair_corner_case(self): Jira ID: DAOS-17852 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckRepairTest,test_check_repair_corner_case """ diff --git a/src/tests/ftest/recovery/check_repair.yaml b/src/tests/ftest/recovery/check_repair.yaml index ef5c1b26486..65141559ced 100644 --- a/src/tests/ftest/recovery/check_repair.yaml +++ b/src/tests/ftest/recovery/check_repair.yaml @@ -5,12 +5,20 @@ timeout: 180 server_config: name: daos_server - engines_per_host: 1 + engines_per_host: 2 engines: 0: - targets: 1 + fabric_iface: ib0 + fabric_iface_port: 31317 + log_file: daos_server0.log + nr_xs_helpers: 1 + storage: auto + 1: + fabric_iface: ib1 + fabric_iface_port: 31417 + log_file: daos_server1.log + nr_xs_helpers: 1 storage: auto - system_ram_reserved: 1 pool: - size: 5G + size: 60G diff --git a/src/tests/ftest/recovery/check_start_options.py b/src/tests/ftest/recovery/check_start_options.py index 6b8fdd28af7..2d17edb95b8 100644 --- a/src/tests/ftest/recovery/check_start_options.py +++ b/src/tests/ftest/recovery/check_start_options.py @@ -47,7 +47,7 @@ def test_check_start_reset(self): Jira ID: DAOS-17623 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckStartOptionsTest,test_check_start_reset """ @@ -161,7 +161,7 @@ def test_check_start_failout(self): Jira ID: DAOS-17818 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckStartOptionsTest,test_check_start_failout """ @@ -259,7 +259,7 @@ def test_check_start_find_orphans(self): Jira ID: DAOS-17819 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckStartOptionsTest,test_check_start_find_orphans """ diff --git a/src/tests/ftest/recovery/check_start_options.yaml b/src/tests/ftest/recovery/check_start_options.yaml index 48d7beb7e75..3d1825a81ed 100644 --- a/src/tests/ftest/recovery/check_start_options.yaml +++ b/src/tests/ftest/recovery/check_start_options.yaml @@ -2,7 +2,7 @@ hosts: test_servers: 1 test_clients: 1 -timeout: 180 +timeout: 5M setup: start_servers_once: False @@ -12,12 +12,14 @@ server_config: engines_per_host: 1 engines: 0: - targets: 1 + fabric_iface: ib0 + fabric_iface_port: 31317 + log_file: daos_server0.log + nr_xs_helpers: 1 storage: auto - system_ram_reserved: 1 pool: - size: 3G + size: 60G container: control_method: daos diff --git a/src/tests/ftest/recovery/check_stop.py b/src/tests/ftest/recovery/check_stop.py index a8898a44b5d..c9a911efdb5 100644 --- a/src/tests/ftest/recovery/check_stop.py +++ b/src/tests/ftest/recovery/check_stop.py @@ -51,7 +51,7 @@ def test_stop_during_repair(self): Jira ID: DAOS-17785 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckStopTest,test_stop_during_repair """ @@ -143,7 +143,7 @@ def test_disable_during_repair(self): Jira ID: DAOS-17785 :avocado: tags=all,full_regression - :avocado: tags=vm + :avocado: tags=hw,medium :avocado: tags=recovery,cat_recov :avocado: tags=DMGCheckStopTest,test_disable_during_repair """ diff --git a/src/tests/ftest/recovery/check_stop.yaml b/src/tests/ftest/recovery/check_stop.yaml index c7e8df83e8c..2863ca4e4f0 100644 --- a/src/tests/ftest/recovery/check_stop.yaml +++ b/src/tests/ftest/recovery/check_stop.yaml @@ -2,19 +2,27 @@ hosts: test_servers: 1 test_clients: 1 -timeout: 150 +timeout: 4M server_config: name: daos_server - engines_per_host: 1 + engines_per_host: 2 engines: 0: - targets: 1 + fabric_iface: ib0 + fabric_iface_port: 31317 + log_file: daos_server0.log + nr_xs_helpers: 1 + storage: auto + 1: + fabric_iface: ib1 + fabric_iface_port: 31417 + log_file: daos_server1.log + nr_xs_helpers: 1 storage: auto - system_ram_reserved: 1 pool: - size: 3G + size: 60G container: type: POSIX