From: Chris Evich <[email protected]> Step file values were being modified to move them under a subdirectory. This patch gets rid of that, and simply adds the subdirectory to each definition. This is the way it's done in kvm test.
Signed-off-by: Chris Evich <[email protected]> --- client/tests/libvirt/subtests.cfg.sample | 87 +++++++++++++++--------------- 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/client/tests/libvirt/subtests.cfg.sample b/client/tests/libvirt/subtests.cfg.sample index d845563..782418b 100644 --- a/client/tests/libvirt/subtests.cfg.sample +++ b/client/tests/libvirt/subtests.cfg.sample @@ -1119,7 +1119,7 @@ variants: no setup image_name = fc8-32 install: - steps = Fedora-8-i386.steps + steps = steps/Fedora-8-i386.steps cdrom_cd1 = isos/linux/Fedora-8-i386-DVD.iso md5sum_cd1 = dd6c79fddfff36d409d02242e7b10189 md5sum_1m_cd1 = dabae451bb69fbbad0e505b25144b1f9 @@ -1137,7 +1137,7 @@ variants: no setup image_name = f8-64 install: - steps = Fedora-8-64.steps + steps = steps/Fedora-8-64.steps cdrom_cd1 = isos/linux/Fedora-8-x86_64-DVD.iso md5sum_cd1 = 2cb231a86709dec413425fd2f8bf5295 md5sum_1m_cd1 = 145f6414e19492649a56c89f0a45e719 @@ -1154,7 +1154,7 @@ variants: - 9.32: image_name = f9-32 install: - steps = Fedora-9-i386.steps + steps = steps/Fedora-9-i386.steps cdrom_cd1 = isos/linux/Fedora-9-i386-DVD.iso md5sum_cd1 = 72601f685ea8c808c303353d8bf4d307 md5sum_1m_cd1 = f24fa25689e5863f1b99984c6feb787f @@ -1172,7 +1172,7 @@ variants: - 9.64: image_name = f9-64 install: - steps = Fedora-9-64.steps + steps = steps/Fedora-9-64.steps cdrom_cd1 = isos/linux/Fedora-9-x86_64-DVD.iso md5sum_cd1 = 05b2ebeed273ec54d6f9ed3d61ea4c96 md5sum_1m_cd1 = 9822ab5097e37e8fe306ef2192727db4 @@ -1214,7 +1214,7 @@ variants: - 11.32: image_name = f11-32 install: - steps = Fedora-11-32.steps + steps = steps/Fedora-11-32.steps unattended_install: unattended_file = unattended/Fedora-11.ks cdrom_unattended = images/f11-32/ks.iso @@ -1357,7 +1357,7 @@ variants: no setup dbench bonnie linux_s3 image_name = dsl-4.2.5 install: - steps = DSL-4.2.5.steps + steps = steps/DSL-4.2.5.steps cdrom_cd1 = isos/linux/dsl-4.2.5.iso md5sum_cd1 = 61694888aede3e01229865b8e6acd4a1 md5sum_1m_cd1 = 527f2481bd25310f2e3a6e5345ff3d12 @@ -1365,7 +1365,7 @@ variants: - Mandriva-One-2007: only install image_name = mandriva-one-2007 - steps = Mandriva-One-2007-32.steps + steps = steps/Mandriva-One-2007-32.steps cdrom_cd1 = isos/linux/mandriva-one-2007-i386.iso md5sum_cd1 = 7e9e183dc11b9d39f480238e4e12bb05 md5sum_1m_cd1 = dc7865a75db665efc86d59bca7c1fe07 @@ -1384,7 +1384,7 @@ variants: - 11.0.32: image_name = openSUSE-11.0-32 install: - steps = openSUSE-11.0-32.steps + steps = steps/openSUSE-11.0-32.steps cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-i386.iso md5sum_cd1 = ed6a5b3feb668866df812b1c2aed9d7f md5sum_1m_cd1 = c720b30557af758e69de450409516369 @@ -1418,7 +1418,7 @@ variants: - 11.1.32: image_name = openSUSE-11.1-32 install: - steps = openSUSE-11.1-32-and-64.steps + steps = steps/openSUSE-11.1-32-and-64.steps cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-i586.iso md5sum_cd1 = 8f51b278c0415be28c5699e465444bd3 md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd @@ -1620,7 +1620,7 @@ variants: - 6.10-32: only install image_name += -6.10-32 - steps = steps/Ubuntu-6.10-32.steps + steps = steps/steps/Ubuntu-6.10-32.steps cdrom_cd1 = isos/linux/ubuntu-6.10-desktop-i386.iso md5sum_cd1 = 17fb825641571ce5888a718329efd016 md5sum_1m_cd1 = 7531d0a84e7451d17c5d976f1c3f8509 @@ -1629,20 +1629,20 @@ variants: skip = yes image_name += -8.04-32 install: - steps = steps/Ubuntu-8.04-32.steps + steps = steps/steps/Ubuntu-8.04-32.steps cdrom_cd1 = isos/linux/ubuntu-8.04.1-desktop-i386.iso setup: - steps = steps/Ubuntu-8.04-32-setupssh.steps + steps = steps/steps/Ubuntu-8.04-32-setupssh.steps - 8.10-server-32: image_name += -8.10-server-32 install: - steps = steps/Ubuntu-8.10-server-32.steps + steps = steps/steps/Ubuntu-8.10-server-32.steps cdrom_cd1 = isos/linux/ubuntu-8.10-server-i386.iso md5sum_cd1 = a2ec9975a91e1228c8292ed9799dc302 md5sum_1m_cd1 = ea493eb8ef7722ead693492fd9f8a13f setup: - steps = steps/Ubuntu-8.10-server-32-gcc.steps + steps = steps/steps/Ubuntu-8.10-server-32-gcc.steps - 11.04-server-64: image_name += -11.04-server-64 @@ -1730,7 +1730,7 @@ variants: os_variant = rhel4 image_name = rhel4-32 install: - steps = RHEL-4.7-i386.steps + steps = steps/RHEL-4.7-i386.steps cdrom_cd1 = isos/linux/RHEL-4.7-i386-DVD.iso md5sum_cd1 = ee5092653732a88ddbaf8eef2484c500 md5sum_1m_cd1 = 127081cbed825d7232331a2083975528 @@ -1755,7 +1755,7 @@ variants: os_variant = rhel4 image_name = rhel4-64 install: - steps = RHEL-4.7-x86_64.steps + steps = steps/RHEL-4.7-x86_64.steps cdrom_cd1 = isos/linux/RHEL-4.7-x86_64-DVD.iso md5sum_cd1 = ea9dae16dd86f7d94092d0e672333292 md5sum_1m_cd1 = 58fa63eaee68e269f4cb1d2edf479792 @@ -1828,7 +1828,7 @@ variants: os_variant = rhel5 image_name = rhel5-32 install: - steps = RHEL-5.3-i386.steps + steps = steps/RHEL-5.3-i386.steps cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso md5sum_cd1 = 371c62851611fd32ead440df6f24a296 md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51 @@ -2198,13 +2198,13 @@ variants: image_name = win2000-32 kill_vm_gracefully = no install: - steps = Win2000-32.steps + steps = steps/Win2000-32.steps cdrom_cd1 = isos/windows/Windows2000_sp4.iso md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea md5sum_1m_cd1 = dd28fba196d366d56fe774bd93df5527 user = user setup: - steps = Win2000-32-rss.steps + steps = steps/Win2000-32-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/Windows2000_sp4.iso md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea @@ -2223,9 +2223,9 @@ variants: md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0 md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd user = user - steps = WinXP-32.steps + steps = steps/WinXP-32.steps setup: - steps = WinXP-32-rss.steps + steps = steps/WinXP-32-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0 @@ -2253,9 +2253,9 @@ variants: md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512 md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513 user = user - steps = WinXP-64.steps + steps = steps/WinXP-64.steps setup: - steps = WinXP-64-rss.steps + steps = steps/WinXP-64-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsXP-64.iso md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512 @@ -2294,9 +2294,9 @@ variants: #md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7 #md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3 user = user - steps = Win2003-32.steps + steps = steps/Win2003-32.steps setup: - steps = Win2003-32-rss.steps + steps = steps/Win2003-32-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_with_sp2_cd1_x13-05460.iso md5sum_cd1 = 7c3bc891d20c7e6a110c4f1ad82952ba @@ -2330,9 +2330,9 @@ variants: #md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd #md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8 user = user - steps = Win2003-64.steps + steps = steps/Win2003-64.steps setup: - steps = Win2003-64-rss.steps + steps = steps/Win2003-64-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_x13-06188.iso md5sum_cd1 = 09f4cb31796e9802dcc477e397868c9a @@ -2378,9 +2378,9 @@ variants: cdrom_cd1 = isos/windows/WindowsVista-32.iso md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491 md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72 - steps = Win-Vista-32.steps + steps = steps/Win-Vista-32.steps setup: - steps = WinVista-32-rss.steps + steps = steps/WinVista-32-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsVista-32.iso md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491 @@ -2417,9 +2417,9 @@ variants: cdrom_cd1 = isos/windows/WindowsVista-64.iso md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165 - steps = Win-Vista-64.steps + steps = steps/Win-Vista-64.steps setup: - steps = WinVista-64-rss.steps + steps = steps/WinVista-64-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsVista-64.iso md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d @@ -2459,9 +2459,9 @@ variants: md5sum_cd1 = 0bfca49f0164de0a8eba236ced47007d md5sum_1m_cd1 = 07d7f5006393f74dc76e6e2e943e2440 sha1sum_cd1 = 6ca018ff96f1e9b2b310a36546b6fded99a421e6 - steps = Win2008-32.steps + steps = steps/Win2008-32.steps setup: - steps = Win2008-32-rss.steps + steps = steps/Win2008-32-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2008-x86.iso md5sum_cd1 = 0bfca49f0164de0a8eba236ced47007d @@ -2485,7 +2485,7 @@ variants: -sp1: image_name += -sp1-64 install: - steps = Win2008-64.steps + steps = steps/Win2008-64.steps cdrom_cd1 = isos/windows/Windows2008-x64.iso #en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso md5sum_cd1 = 27c58cdb3d620f28c36333a5552f271c @@ -2493,7 +2493,7 @@ variants: sha1sum_cd1 = bd000374709f67e9358814db6ec8f0ddaaa16f70 passwd = 1q2w3eP setup: - steps = Win2008-64-rss.steps + steps = steps/Win2008-64-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2008-x64.iso md5sum_cd1 = 27c58cdb3d620f28c36333a5552f271c @@ -2561,9 +2561,9 @@ variants: md5sum_cd1 = f43d22e4fb07bf617d573acd8785c028 md5sum_1m_cd1 = b44d8cf99dbed2a5cb02765db8dfd48f passwd = 1q2w3eP - steps = Win7-64.steps + steps = steps/Win7-64.steps setup: - steps = Win7-64-rss.steps + steps = steps/Win7-64-rss.steps unattended_install.cdrom, whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso md5sum_cd1 = f43d22e4fb07bf617d573acd8785c028 @@ -2593,14 +2593,14 @@ variants: - NetBSD-1.6.2: image_name = NetBSD-1.6.2 image_size = 4G - steps = NetBSD-1.6.2.steps + steps = steps/NetBSD-1.6.2.steps cdrom_cd1 = isos/bsd/netbsd-1.6.2-i386.iso md5sum_cd1 = 72eb680300f77d529bfbc880ba8208f3 md5sum_1m_cd1 = f1a9e1e825c90adfb1be35c6177bd9ac - OpenBSD-4.1: image_name = OpenBSD-4.1 - steps = OpenBSD-4.1-32.steps + steps = steps/OpenBSD-4.1-32.steps cdrom_cd1 = isos/unix/openbsd41-i386-07-05-06.iso md5sum_cd1 = 984790db10ebdd6fc7a9cf97abc7c967 md5sum_1m_cd1 = 8fc234b4b0ecfe56843a32ac1d26ed55 @@ -2614,26 +2614,26 @@ variants: variants: - Belenix: - steps = Belenix-0.7.1.steps + steps = steps/Belenix-0.7.1.steps cdrom_cd1 = isos/unix/belenix_0.7.1.iso md5sum_cd1 = 29cea6160cf5250de138e2820e53e342 md5sum_1m_cd1 = 427bbef1b85d6d051799b825d686ae94 - Slax: - steps = Slax-6.0.7.steps + steps = steps/Slax-6.0.7.steps cdrom_cd1 = isos/linux/slax-6.0.7.iso md5sum_cd1 = cde0ecba3c8289d786e12c44666ded6e md5sum_1m_cd1 = ddf02bc7444f22d1160a6e5a8fc8723f - FreeSBIE-2.0.1: - steps = FreeSBIE-2.0.1.steps + steps = steps/FreeSBIE-2.0.1.steps cdrom_cd1 = isos/unix/FreeSBIE-2.0.1-RELEASE.iso md5sum_cd1 = b2f680d27c21bbfaf4fb90dce090a118 md5sum_1m_cd1 = 4d81ee7fe0101b0a14225963bfff60c1 - memtest: mem = 128 - steps = memtest86+.steps + steps = steps/memtest86+.steps cdrom_cd1 = isos/misc/memtest86+-2.01.iso md5sum_cd1 = 9fae22f2666369968a76ef59e9a81ced @@ -2649,4 +2649,3 @@ virtio_net, virtio_blk, e1000, balloon_check: kdump, watchdog: only RHEL.5 RHEL.6 -steps ?<= steps/ -- 1.7.7.1 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
