From patchwork Mon Dec 27 16:01:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434611 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9j025997 for ; Mon, 27 Dec 2010 20:16:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754412Ab0L0QCg (ORCPT ); Mon, 27 Dec 2010 11:02:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45911 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754391Ab0L0QCf (ORCPT ); Mon, 27 Dec 2010 11:02:35 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2YXw028911 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:34 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2XIT030691; Mon, 27 Dec 2010 11:02:33 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rGA017175; Mon, 27 Dec 2010 11:02:32 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 22/28] KVM test: whql: add a network submission Date: Mon, 27 Dec 2010 18:01:49 +0200 Message-Id: <1293465715-16599-22-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:58 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index e81d879..83f5e4d 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -351,7 +351,21 @@ variants: dsso_delete_machine_binary = deps/whql_delete_machine_15.exe wtt_services = wttsvc variants: - - client_install: + - support_vm_install: + # The support VM is identical to the tested VM in every way + # except for the image name which ends with '-supportvm'. + type = unattended_install + pre_command += " scripts/unattended.py;" + extra_params += " -boot d" + force_create_image = yes + kill_vm = yes + nic_mode = user + redirs += " unattended_install" + guest_port_unattended_install = 12323 + medium = cdrom + kernel = + initrd = + - client_install: support_vm_install type = whql_client_install # The username and password are required for accessing the DTM client # installer binary shared by the server @@ -361,7 +375,10 @@ variants: # (the final cmd will be something like \\servername\DTMInstall\...) install_cmd = \DTMInstall\Client\Setup.exe /passive install_timeout = 3600 - - submission: client_install + variants: + - @original: + - support_vm: + - submission: client_install support_vm_install type = whql_submission extra_params += " -snapshot" restart_vm = yes @@ -412,6 +429,36 @@ variants: dd_data_cat2 = System Fundamentals\Dynamic Partitioning dd_data_prog = InputKbd dd_data_desc = Input > Keyboard + - net: + # Add a support machine and extra NICs + vms += " supportvm" + nics += " nic2 nic3" + test_device = RTL8139.*NIC$ + test_timeout = 86400 + dd_data_cat0 = Network\LAN (Ethernet) + dd_data_cat1 = Device Fundamentals + dd_data_cat2 = System Fundamentals\Dynamic Partitioning + dd_data_prog = NetLan + dd_data_desc = Network > LAN (Ethernet) + # Machine dimensions + dimensions = testrole + dim_name_testrole = NetDevice\TestRole + dim_value_testrole_vm1 = NdistestLanClient + dim_value_testrole_supportvm = NdistestLanServer + # Device selection for the NDISTest client machine + device_params_vm1 = testdev clientmsgdev clientsupportdev + dp_name_testdev = NdistestLanClientTestDevice + dp_regex_testdev = RTL8139.*NIC$ + dp_name_clientmsgdev = NdistestLanClientMessageDevice + dp_regex_clientmsgdev = RTL8139.*NIC #2$ + dp_name_clientsupportdev = NdistestLanClientSupportDevice0 + dp_regex_clientsupportdev = RTL8139.*NIC #3$ + # Device selection for the NDISTest server machine + device_params_supportvm = servermsgdev serversupportdev + dp_name_servermsgdev = NdistestLanServerMessageDevice + dp_regex_servermsgdev = RTL8139.*NIC$ + dp_name_serversupportdev = NdistestLanServerSupportDevice0 + dp_regex_serversupportdev = RTL8139.*NIC #2$ - hdd: # Run the tests on a non-system drive # (match device names that contain 'QEMU HARDDISK' and do not contain '[C]') @@ -1606,7 +1653,7 @@ variants: mem_chk_cmd = wmic memphysical mem_chk_cur_cmd = wmic memphysical - unattended_install: + unattended_install.cdrom|whql.support_vm_install: timeout = 7200 finish_program = deps/finish.exe cdroms += " winutils" @@ -1718,7 +1765,7 @@ variants: steps = WinXP-32.steps setup: steps = WinXP-32-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0 md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd @@ -1738,6 +1785,8 @@ variants: dd_data_whqlos = Windows XP device: dd_data_whqlqual = Basic + device.net: + image_name_supportvm = winXP-32-supportvm - 64: image_name += -64 @@ -1749,7 +1798,7 @@ variants: steps = WinXP-64.steps setup: steps = WinXP-64-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsXP-64.iso md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512 md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513 @@ -1769,6 +1818,8 @@ variants: dd_data_whqlos = Windows XP x64 device: dd_data_whqlqual = Basic + device.net: + image_name_supportvm = winXP-64-supportvm - Win2003: image_name = win2003 @@ -1785,7 +1836,7 @@ variants: steps = Win2003-32.steps setup: steps = Win2003-32-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7 md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3 @@ -1804,6 +1855,8 @@ variants: dd_data_whqlos = Windows Server 2003 device: dd_data_whqlqual = Basic + device.net: + image_name_supportvm = win2003-32-supportvm - 64: image_name += -64 @@ -1815,7 +1868,7 @@ variants: steps = Win2003-64.steps setup: steps = Win2003-64-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2003-x64.iso md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8 @@ -1834,6 +1887,8 @@ variants: dd_data_whqlos = Windows Server 2003 x64 device: dd_data_whqlqual = Basic + device.net: + image_name_supportvm = win2003-64-supportvm - WinVista: image_name = winvista @@ -1861,7 +1916,7 @@ variants: steps = Win-Vista-32.steps setup: steps = WinVista-32-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsVista-32.iso md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491 md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72 @@ -1873,10 +1928,12 @@ variants: virtio_storage_path = 'F:\viostor\w7\x86' virtio_network_path = 'F:\NetKVM\w7\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' + whql.submission.device.net: + image_name_supportvm = winvista-sp1-32-supportvm - sp2: image_name += -sp2-32 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_vista_with_sp2_x86_dvd_342266.iso md5sum_cd1 = 19ca90a425667812977bab6f4ce24175 md5sum_1m_cd1 = 89c15020e0e6125be19acf7a2e5dc614 @@ -1890,6 +1947,8 @@ variants: virtio_storage_path = 'F:\viostor\w7\x86' virtio_network_path = 'F:\NetKVM\w7\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' + whql.submission.device.net: + image_name_supportvm = winvista-sp2-32-supportvm - 64: whql.submission: @@ -1908,7 +1967,7 @@ variants: steps = Win-Vista-64.steps setup: steps = WinVista-64-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/WindowsVista-64.iso md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165 @@ -1920,9 +1979,12 @@ variants: virtio_storage_path = 'F:\viostor\w7\amd64' virtio_network_path = 'F:\NetKVM\w7\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' + whql.submission.device.net: + image_name_supportvm = winvista-sp1-64-supportvm + - sp2: image_name += -sp2-64 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_vista_sp2_x64_dvd_342267.iso md5sum_cd1 = a1c024d7abaf34bac3368e88efbc2574 md5sum_1m_cd1 = 3d84911a80f3df71d1026f7adedc2181 @@ -1936,6 +1998,8 @@ variants: virtio_storage_path = 'F:\viostor\w7\amd64' virtio_network_path = 'F:\NetKVM\w7\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' + whql.submission.device.net: + image_name_supportvm = winvista-sp2-64-supportvm - Win2008: no whql @@ -1956,7 +2020,7 @@ variants: steps = Win2008-32.steps setup: steps = Win2008-32-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2008-x86.iso md5sum=0bfca49f0164de0a8eba236ced47007d md5sum_1m=07d7f5006393f74dc76e6e2e943e2440 @@ -1971,7 +2035,7 @@ variants: - sp2: image_name += -sp2-32 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso md5sum_cd1 = b9201aeb6eef04a3c573d036a8780bdf md5sum_1m_cd1 = b7a9d42e55ea1e85105a3a6ad4da8e04 @@ -2000,7 +2064,7 @@ variants: passwd = 1q2w3eP setup: steps = Win2008-64-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/Windows2008-x64.iso md5sum=27c58cdb3d620f28c36333a5552f271c md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766 @@ -2015,7 +2079,7 @@ variants: - sp2: image_name += -sp2-64 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso md5sum_cd1 = e94943ef484035b3288d8db69599a6b5 md5sum_1m_cd1 = ee55506823d0efffb5532ddd88a8e47b @@ -2032,7 +2096,7 @@ variants: - r2: image_name += -r2-64 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso md5sum_cd1 = 0207ef392c60efdda92071b0559ca0f9 md5sum_1m_cd1 = a5a22ce25008bd7109f6d830d627e3ed @@ -2060,7 +2124,7 @@ variants: variants: - 32: image_name += -32 - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_7_ultimate_x86_dvd_x15-65921.iso md5sum_cd1 = d0b8b407e8a3d4b75ee9c10147266b89 md5sum_1m_cd1 = 2b0c2c22b1ae95065db08686bf83af93 @@ -2080,6 +2144,8 @@ variants: dd_data_whqlos = Windows 7 Client device: dd_data_whqlqual = Logo + device.net: + image_name_supportvm = win7-32-supportvm - 64: image_name += -64 @@ -2091,7 +2157,7 @@ variants: steps = Win7-64.steps setup: steps = Win7-64-rss.steps - unattended_install.cdrom: + unattended_install.cdrom|whql.support_vm_install: cdrom_cd1 = isos/windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso md5sum_cd1 = f43d22e4fb07bf617d573acd8785c028 md5sum_1m_cd1 = b44d8cf99dbed2a5cb02765db8dfd48f @@ -2111,6 +2177,8 @@ variants: dd_data_whqlos = Windows 7 Client x64 device: dd_data_whqlqual = Logo + device.net: + image_name_supportvm = win7-64-supportvm # Unix/BSD section @@ -2169,6 +2237,10 @@ variants: md5sum_cd1 = 9fae22f2666369968a76ef59e9a81ced +whql.support_vm_install|whql.client_install.support_vm: + image_name += -supportvm + + variants: - @up: no autotest.npb autotest.tsc