From: Alexey Eromenko <aerom...@redhat.com>
1. Add variants for WinXP.64 and Win2003.64 to kvm_tests.cfg.sample.
2. Convert WinXP.64 and Win2003.64 step files to the new format.
Signed-off-by: Alexey Eromenko <aerom...@redhat.com>
Signed-off-by: Michael Goldish <mgold...@redhat.com>
Signed-off-by: Uri Lublin <u...@redhat.com>
diff --git a/client/tests/kvm_runtest_2/kvm_tests.cfg.sample
b/client/tests/kvm_runtest_2/kvm_tests.cfg.sample
index 942f07e..72e4443 100644
--- a/client/tests/kvm_runtest_2/kvm_tests.cfg.sample
+++ b/client/tests/kvm_runtest_2/kvm_tests.cfg.sample
@@ -278,46 +278,73 @@ variants:
install:
steps = Win2000-32.steps
cdrom = windows/Windows2000_sp4.iso
- md5sum=dda6039f3a9173f0f6bfae40f5efdfea
- md5sum_1m=dd28fba196d366d56fe774bd93df5527
+ md5sum = dda6039f3a9173f0f6bfae40f5efdfea
+ md5sum_1m = dd28fba196d366d56fe774bd93df5527
user = user
cdkey = WIN_2000_32_CDKEY
setup:
steps = Win2000-32-setupssh.steps
cdrom = windows/setupssh.iso
- - WinXP:
+ - WinXP.32:
image_name = winXP-32
install:
steps = WinXP-32.steps
cdrom = windows/WindowsXP-sp2-vlk.iso
- md5sum_1m=b473bf75af2d1269fec8958cf0202bfd
+ md5sum = 743450644b1d9fe97b3cf379e22dceb0
+ md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
user = user
cdkey = WIN_XP_32_CDKEY
setup:
steps = WinXP-32-setupssh.steps
cdrom = windows/setupssh.iso
+ - WinXP.64:
+ only install
+ image_name = winXP-64
+ install:
+ steps = WinXP-64.steps
+ cdrom = windows/WindowsXP-64.iso
+ md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
+ md5sum_1m = e812363ff427effc512b7801ee70e513
+ user = user
+ cdkey = WIN_XP_64_CDKEY
+
- Win2003:
- image_name = win2003-32
image_size = 20G
cmd_shutdown = shutdown /s /f /t 0
cmd_reboot = shutdown /r /f /t 0
- install:
- steps = Win2003-32.steps
- cdrom = windows/Windows2003_r2_VLK.iso
- md5sum=03e921e9b4214773c21a39f5c3f42ef7
- md5sum_1m=37c2fdec15ac4ec16aa10fdfdb338aa3
- user = user
- cdkey = WIN_2003_32_CDKEY
- setup:
- steps = Win2003-32-setupssh.steps
- cdrom = windows/setupssh.iso
+
+ variants:
+ - 32:
+ image_name = win2003-32
+ install:
+ steps = Win2003-32.steps
+ cdrom = windows/Windows2003_r2_VLK.iso
+ md5sum = 03e921e9b4214773c21a39f5c3f42ef7
+ md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
+ user = user
+ cdkey = WIN_2003_32_CDKEY
+ setup:
+ steps = Win2003-32-setupssh.steps
+ cdrom = windows/setupssh.iso
+
+ - 64:
+ only install
+ image_name = win2003-64
+ install:
+ steps = Win2003-64.steps
+ cdrom = windows/Windows2003-x64.iso
+ md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
+ md5sum_1m = 439393c384116aa09e08a0ad047dcea8
+ user = user
+ cdkey = WIN_2003_64_CDKEY
- WinVista:
only install
image_name = winvista
image_size = 20G
+
variants:
- 32:
image_name += -32
@@ -325,6 +352,7 @@ variants:
cdrom = windows/WindowsVista-32.iso
md5sum = 1008f323d5170c8e614e52ccb85c0491
md5sum_1m = c724e9695da483bc0fd59e426eaefc72
+
- 64:
image_name += -64
steps = Win-Vista-64.steps
@@ -342,6 +370,7 @@ variants:
use_telnet = yes
username = Administrator
password = 1q2w3eP
+
variants:
- 32:
image_name += -32
@@ -353,6 +382,7 @@ variants:
setup:
steps = Win2008-32-setuptelnet.steps
cdrom = windows/setuptelnet.iso
+
- 64:
image_name += -64
install:
diff --git a/client/tests/kvm_runtest_2/steps/Win2003-64.steps
b/client/tests/kvm_runtest_2/steps/Win2003-64.steps
index 953a54a..2ce794f 100644
--- a/client/tests/kvm_runtest_2/steps/Win2003-64.steps
+++ b/client/tests/kvm_runtest_2/steps/Win2003-64.steps
@@ -2,34 +2,46 @@
# Generated on Mon Dec 15 11:09:35 2008
# uname -a: Linux pink-nehalem.qa.lab.tlv.redhat.com 2.6.27.5-117.fc10.x86_64
#1 SMP Tue Nov 18 11:58:53 EST 2008 x86_64 x86_64 x86_64 GNU/Linux
# QEMU command line: ../qemu-kvm -cdrom /isos/windows/Windows2003-x64.iso -m
512 -hda /vm/windows2003-64.qcow2 -nographic -monitor
unix:/tmp/monitor_75760233472,server,nowait &
-# -------- Step 1 recorded at time 48.67 --------
+# --------------------------------
+step 48.67
+screendump 20080101_000001_d23c8c97a0b0bd0817829e4ba5586bb9.ppm
# Windows Server 2003 Welcome
barrier_2 176 26 5 8 81f701bcc07fdde6579aaeb3301b8c04 243
# Sending keys: ret
key ret
-# -------- Step 2 recorded at time 50.21 --------
+# --------------------------------
+step 50.21
+screendump 20080101_000002_dab2a2e63b2379de041cece733e39306.ppm
# License
barrier_2 254 32 5 7 60c0d5a136f20b53b2e6401fee12a39e 8
# Sending keys: f8
key f8
-# -------- Step 3 recorded at time 51.72 --------
+# --------------------------------
+step 51.72
+screendump 20080101_000003_7d125050bfbe85e60db662ad476dfc82.ppm
# HDD Partitioning
barrier_2 600 94 17 79 7c230e9711b413f9c29062bb12ae1d86 8
# Sending keys: ret
key ret
-# -------- Step 4 recorded at time 55.84 --------
+# --------------------------------
+step 55.84
+screendump 20080101_000004_3834f6a401372180ecae90eb3b675d5d.ppm
# HDD Format
barrier_2 192 62 32 199 3a1da59a2d0d5c1a818e1daa3ba57f9e 21
# Sending keys: up up ret
key up
key up
key ret
-# -------- Step 5 recorded at time 463.68 --------
+# --------------------------------
+step 463.68
+screendump 20080101_000005_9aca2d06e58cb532f051f0d62ec10609.ppm
# Regional & Language Options
barrier_2 205 19 155 71 b6ee959efba7247f1fe522ba47efadb8 2039
# Sending keys: alt-n
key alt-n
-# -------- Step 6 recorded at time 464.96 --------
+# --------------------------------
+step 464.96
+screendump 20080101_000006_47a37b82731c6130191dbc0563143606.ppm
# User & Org
barrier_2 75 49 225 201 b11d0a32a5180b1074c26666f9ced036 6
# Sending keys: u s e r ret
@@ -38,62 +50,86 @@ key s
key e
key r
key ret
-# -------- Step 7 recorded at time 467.14 --------
+# --------------------------------
+step 467.14
+screendump 20080101_000007_a8c24c49ec0da7deac930d876a5e52f9.ppm
# CD-Key
barrier_2 72 21 177 274 9fe326905e4ce78d21bf2fabf7254fd8 11
var cdkey
key ret
-# -------- Step 8 recorded at time 474.13 --------
+# --------------------------------
+step 474.13
+screendump 20080101_000008_f28b4fe1588659709b79e209d6b32066.ppm
# Server Licensing
barrier_2 228 27 227 145 621add6e9a47dbd06a7a75ceea8de860 35
# Sending keys: ret
key ret
-# -------- Step 9 recorded at time 477.40 --------
+# --------------------------------
+step 477.40
+screendump 20080101_000009_47dced7f55b3cea4c66855c397880560.ppm
# PC name
barrier_2 97 20 219 199 e23bb0bef972d0b9e442bef69813fcfe 16
# Sending keys: ret
key ret
-# -------- Step 10 recorded at time 479.52 --------
+# --------------------------------
+step 479.52
+screendump 20080101_000010_8e2cf90045f0903e6e26ad737ccb69ab.ppm
# Weak Password Warning
barrier_2 321 30 269 191 ed09ffcbb24e10758caba116d7a48cf5 11
# Sending keys: alt-y
key alt-y
-# -------- Step 11 recorded at time 484.20 --------
+# --------------------------------
+step 484.20
+screendump 20080101_000011_33e16e6254e9896602e2f347d61beb81.ppm
# Date & Time settings
barrier_2 143 20 156 72 ed2f168ac4df35c0de455f3a401f2e11 23
# Sending keys: ret
key ret
-# -------- Step 12 recorded at time 590.18 --------
+# --------------------------------
+step 590.18
+screendump 20080101_000012_548d686c826c2810803958c70d216b8d.ppm
# Network Settings
barrier_2 127 18 155 74 5682815d192212d0817afab4cabf0ee0 300
# Sending keys: ret
key ret
-# -------- Step 13 recorded at time 594.24 --------
+# --------------------------------
+step 594.24
+screendump 20080101_000013_429fd49b57bad17574d960bf579f225d.ppm
# Workgroup
barrier_2 69 19 157 73 aad1efc70ff7c143788d5bafd37b9316 20
# Sending keys: ret
key ret
-# -------- Step 14 recorded at time 1061.57 --------
+# --------------------------------
+step 1061.57
+screendump 20080101_000014_b38424f45e0149507009594bda92c15e.ppm
# Windows Login (GINA)
barrier_2 168 26 165 210 b7342c534ffda9ff052044c9722ed212 900
# Sending keys: ctrl-alt-delete
key ctrl-alt-delete
-# -------- Step 15 recorded at time 1064.07 --------
+# --------------------------------
+step 1064.07
+screendump 20080101_000015_cf0311622a4b1beaef85c0ca0363b608.ppm
# Windows Login (GINA) 2
barrier_2 65 24 120 220 d1250d746318781164fb25437370f1b1 13
# Sending keys: ret
key ret
-# -------- Step 16 recorded at time 1077.51 --------
+# --------------------------------
+step 1077.51
+screendump 20080101_000016_4ed0f5b690ece61731f56883df60bbe0.ppm
# Windows 2003 Desktop
barrier_2 30 34 2 441 0a55f7afacdfef5eccdd11646abce2b6 67
# Sending keys: 0xdc
key 0xdc
-# -------- Step 17 recorded at time 1081.26 --------
+# --------------------------------
+step 1081.26
+screendump 20080101_000017_defe197bc5b379b442c5bbbf9fe649f1.ppm
# Windows 2003 Start Menu Opened
barrier_2 29 19 321 429 2c7df6a8da99f7a33e37b94d165129f4 19
# Sending keys: u
key u
-# -------- Step 18 recorded at time 1082.84 --------
+# --------------------------------
+step 1082.84
+screendump 20080101_000018_a94ffa747e87753af749592521d77e66.ppm
# Windows 2003 Shutdown
barrier_2 58 8 184 134 20537c177472d1add47a6ff7cca79ddb 8
# Sending keys: tab tab tab m y c o m m e n t
@@ -109,7 +145,9 @@ key m
key e
key n
key t
-# -------- Step 19 recorded at time 1086.79 --------
+# --------------------------------
+step 1086.79
+screendump 20080101_000019_e70d3746292e81f01fa840424a941d31.ppm
# Windows 2003 Shutdown OK
barrier_2 40 53 291 416 7596f2b8871430884aaadbc3d3f96f43 20
# Sending keys: ret
diff --git a/client/tests/kvm_runtest_2/steps/WinXP-64.steps
b/client/tests/kvm_runtest_2/steps/WinXP-64.steps
index 8b6941f..20bac81 100644
--- a/client/tests/kvm_runtest_2/steps/WinXP-64.steps
+++ b/client/tests/kvm_runtest_2/steps/WinXP-64.steps
@@ -2,34 +2,46 @@
# Generated on Mon Dec 15 12:18:59 2008
# uname -a: Linux pink-nehalem.qa.lab.tlv.redhat.com 2.6.27.5-117.fc10.x86_64
#1 SMP Tue Nov 18 11:58:53 EST 2008 x86_64 x86_64 x86_64 GNU/Linux
# QEMU command line: ../qemu-kvm -hda /vm/xp64-test.qcow2 -cdrom
/isos/windows/WindowsXP-x64.iso -m 512 -boot d -nographic -monitor
unix:/tmp/monitor_661286036863,server,nowait &
-# -------- Step 1 recorded at time 37.42 --------
+# --------------------------------
+step 37.42
+screendump 20080101_000001_4500e9fcd78ebaf293073b71a8e5d0fc.ppm
# XP Welcome
barrier_2 99 26 5 10 b3533344412ba9d6807187f58217e299 187
# Sending keys: ret
key ret
-# -------- Step 2 recorded at time 38.08 --------
+# --------------------------------
+step 38.08
+screendump 20080101_000002_bfd529d5c8bd0e364f71701cf16d1d58.ppm
# License
barrier_2 256 32 7 8 7878cccd089fb5b4fcb31bec062c7336 5
# Sending keys: f8
key f8
-# -------- Step 3 recorded at time 39.07 --------
+# --------------------------------
+step 39.07
+screendump 20080101_000003_aa97d02dbb567f96ec739b98bc3c7288.ppm
# HDD Partitioning
barrier_2 606 68 35 106 9589431786dfd07961819f6300d464de 5
# Sending keys: ret
key ret
-# -------- Step 4 recorded at time 39.94 --------
+# --------------------------------
+step 39.94
+screendump 20080101_000004_66235ea61d2b6fa703dc6adeb29f4192.ppm
# HDD Format
barrier_2 530 74 39 197 c891d0bc3975320ad7e66627ad67dee3 5
# Sending keys: up up ret
key up
key up
key ret
-# -------- Step 5 recorded at time 269.68 --------
+# --------------------------------
+step 269.68
+screendump 20080101_000005_7779995e280d166f53e6182dbde38b1f.ppm
# Regional & Language
barrier_2 195 19 156 72 719cccacc44ddeefdaebace117721ca8 1149
# Sending keys: ret
key ret
-# -------- Step 6 recorded at time 271.40 --------
+# --------------------------------
+step 271.40
+screendump 20080101_000006_fd4018fb99458bae6a91d097873cedbd.ppm
# Name & org
barrier_2 75 62 225 196 2460b46c4281fc9141620df8a0e122de 9
# Sending keys: u s e r ret
@@ -38,44 +50,62 @@ key s
key e
key r
key ret
-# -------- Step 7 recorded at time 274.69 --------
+# --------------------------------
+step 274.69
+screendump 20080101_000007_34e1c0bc3357a5ef8eeff9b939d2e88f.ppm
# CD-Key
barrier_2 69 21 182 274 32bea723ba9510fbdfcfb0fd1ba2485f 16
var cdkey
key ret
-# -------- Step 8 recorded at time 282.44 --------
+# --------------------------------
+step 282.44
+screendump 20080101_000008_a7e894aca70da04697bb62670a391090.ppm
# Comp name
barrier_2 85 20 230 198 ee725a5e95996aa2a520e638e9955614 39
# Sending keys: ret
key ret
-# -------- Step 9 recorded at time 284.95 --------
+# --------------------------------
+step 284.95
+screendump 20080101_000009_abdccb421511e47d3a50b84e6b4b5755.ppm
# Date & Time
barrier_2 147 19 154 72 9a3a9141b807d975124322167b207ae7 13
# Sending keys: ret
key ret
-# -------- Step 10 recorded at time 286.86 --------
+# --------------------------------
+step 286.86
+screendump 20080101_000010_bb878343930f948c0346f103a387157a.ppm
barrier_2 69 15 179 8 93889bdbe5351e61a6d9c7d00bb1c971 10
-# -------- Step 11 recorded at time 409.46 --------
+# --------------------------------
+step 409.46
+screendump 20080101_000011_30db9777a7883a07e6e65bff74e1d98f.ppm
# Network Settings
barrier_2 123 16 159 73 a90619321e46fb63918dd6f890dd7758 613
# Sending keys: ret
key ret
-# -------- Step 12 recorded at time 410.91 --------
+# --------------------------------
+step 410.91
+screendump 20080101_000012_46dcf24a3aa1dd519a0f24cee5de2863.ppm
# Workgroup
barrier_2 76 17 152 73 5fa6b8258e882a92e7fd2acb7764ad15 7
# Sending keys: ret
key ret
-# -------- Step 13 recorded at time 974.93 --------
+# --------------------------------
+step 974.93
+screendump 20080101_000013_6833309ea27ceb912c6e43e2b8252126.ppm
# Windows XP x64 Desktop
barrier_2 74 24 7 455 a099dae90bbd59e79442af0975bb6a01 2400
# Sending keys: 0xdc
key 0xdc
-# -------- Step 14 recorded at time 978.02 --------
+# --------------------------------
+step 978.02
+screendump 20080101_000014_213fbe6fa13bf32dfac6a00bf4205e45.ppm
# Windows XP Start Menu Opened
barrier_2 48 20 274 420 c4a9620d84508013050e5a37a0d9e4ef 15
# Sending keys: u
key u
-# -------- Step 15 recorded at time 979.46 --------
+# --------------------------------
+step 979.46
+screendump 20080101_000015_3f6a35dc7f1a46b10bd4e2dad45e74a1.ppm
# Windows XP Shutdown
barrier_2 60 61 291 172 ae1d8cf3b1bf0abbd74d4a2b55b17679 7
# Sending keys: u
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
