summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/tests/kvm/tests_base.cfg.sample42
1 files changed, 23 insertions, 19 deletions
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index f2c36558..7f2c41de 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -237,25 +237,6 @@ variants:
- fmt_raw:
image_format_stg = raw
- - system_reset: install setup unattended_install
- type = boot
- reboot_method = system_reset
- sleep_before_reset = 20
- kill_vm_on_error = yes
-
- - system_powerdown: install setup unattended_install
- type = shutdown
- shutdown_method = system_powerdown
- sleep_before_powerdown = 20
- kill_vm = yes
- kill_vm_gracefully = no
-
- - shutdown: install setup unattended_install
- type = shutdown
- shutdown_method = shell
- kill_vm = yes
- kill_vm_gracefully = no
-
- vlan_tag: install setup unattended_install
type = vlan_tag
# subnet should not be used by host
@@ -272,6 +253,29 @@ variants:
type = physical_resources_check
catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
+ # system_powerdown, system_reset and shutdown *must* be the last ones
+ # defined (in this order), since the effect of such tests can leave
+ # the VM on a bad state.
+ - system_powerdown: install setup unattended_install
+ type = shutdown
+ shutdown_method = system_powerdown
+ sleep_before_powerdown = 20
+ kill_vm = yes
+ kill_vm_gracefully = no
+
+ - system_reset: install setup unattended_install
+ type = boot
+ reboot_method = system_reset
+ sleep_before_reset = 20
+ kill_vm_on_error = yes
+
+ - shutdown: install setup unattended_install
+ type = shutdown
+ shutdown_method = shell
+ kill_vm = yes
+ kill_vm_gracefully = no
+ # Do not define test variants below shutdown
+
# NICs
variants:
- @rtl8139: