diff mbox

[KVM-AUTOTEST,1/7] KVM test: make all tests depend on install, setup & unattended_install

Message ID 1257415272-9423-1-git-send-email-mgoldish@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michael Goldish Nov. 5, 2009, 10:01 a.m. UTC
None
diff mbox

Patch

diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index bcc31bb..f271a09 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -58,23 +58,23 @@  variants:
         floppy = "images/floppy.img"
         extra_params += " -boot d"
 
-    - setup:        install
+    - setup:        install unattended_install
         type = steps
         fail_if_stuck_for = 300
         stuck_detection_history = 2
         kill_vm_on_error = yes
         keep_screendump_history = yes
 
-    - boot:         install setup
+    - boot:         install setup unattended_install
         type = boot
         kill_vm_on_error = yes
 
-    - reboot:       install setup
+    - reboot:       install setup unattended_install
         type = boot
         reboot_method = shell
         kill_vm_on_error = yes
 
-    - migrate:      install setup
+    - migrate:      install setup unattended_install
         type = migration
         migration_test_command = help
         migration_bg_command = "cd /tmp; nohup tcpdump -q -t ip host localhost"
@@ -84,7 +84,7 @@  variants:
         iterations = 2
         used_mem = 1024
 
-    - autotest:     install setup
+    - autotest:     install setup unattended_install
         type = autotest
         test_timeout = 720
         variants:
@@ -118,10 +118,10 @@  variants:
                 test_control_file = npb.control
 
 
-    - linux_s3:     install setup
+    - linux_s3:     install setup unattended_install
         type = linux_s3
 
-    - timedrift:    install setup
+    - timedrift:    install setup unattended_install
         extra_params += " -rtc-td-hack"
         variants:
             - with_load:
@@ -148,7 +148,7 @@  variants:
                 drift_threshold = 10
                 drift_threshold_single = 3
 
-    - stress_boot:  install setup
+    - stress_boot:  install setup unattended_install
         type = stress_boot
         max_vms = 5    
         alive_test_cmd = uname -a
@@ -160,7 +160,7 @@  variants:
         used_cpus = 5
         used_mem = 2560
 
-    - autoit:       install setup
+    - autoit:       install setup unattended_install
         type = autoit
         autoit_binary = D:\AutoIt3.exe
         autoit_script_timeout = 600
@@ -169,7 +169,7 @@  variants:
             - notepad:
                 autoit_script = autoit/notepad1.au3
 
-    - guest_s4:
+    - guest_s4:     install setup unattended_install
         type = guest_s4
         check_s4_support_cmd = grep -q disk /sys/power/state
         test_s4_cmd = "cd /tmp; nohup tcpdump -q -t ip host localhost"
@@ -178,7 +178,7 @@  variants:
         kill_test_s4_cmd = pkill tcpdump
         services_up_timeout = 30
 
-    - nic_hotplug:       install setup
+    - nic_hotplug:  install setup unattended_install
         type = pci_hotplug
         pci_type = nic
         modprobe_acpiphp = no
@@ -197,7 +197,7 @@  variants:
                 pci_model = e1000
                 match_string = "Gigabit Ethernet Controller"
 
-    - block_hotplug:       install setup
+    - block_hotplug: install setup unattended_install
         type = pci_hotplug
         pci_type = block
         reference_cmd = lspci
@@ -225,25 +225,26 @@  variants:
                 image_format_stg = raw
                 only Fedora Ubuntu Windows
 
-    - system_reset: install setup
+    - 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
+    - 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
+    - shutdown:     install setup unattended_install
         type = shutdown
         shutdown_method = shell
         kill_vm = yes
         kill_vm_gracefully = no
 
+
 # NICs
 variants:
     - @rtl8139: