From patchwork Mon Dec 27 16:01:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434521 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 oBRKCV9f025997 for ; Mon, 27 Dec 2010 20:16:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754387Ab0L0QCa (ORCPT ); Mon, 27 Dec 2010 11:02:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33015 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754381Ab0L0QC3 (ORCPT ); Mon, 27 Dec 2010 11:02:29 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2ShW003925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:28 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2Sfv003629; Mon, 27 Dec 2010 11:02:28 -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 oBRG1rG6017175; Mon, 27 Dec 2010 11:02:27 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 18/28] KVM test: whql: rename the whql_submission variant to whql.submission Date: Mon, 27 Dec 2010 18:01:45 +0200 Message-Id: <1293465715-16599-18-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.23 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:56 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 147d89a..b2419b0 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -337,7 +337,7 @@ variants: iozone_cmd = "D:\IOzone\iozone.exe -a" iozone_timeout = 3600 - - @whql: install setup unattended_install.cdrom + - whql: install setup unattended_install.cdrom nic_mode = tap # Replace this with the address of an installed DTM server server_address = 10.20.30.40 @@ -349,7 +349,7 @@ variants: server_studio_path = %programfiles%\Microsoft Driver Test Manager\Studio wtt_services = wttsvc variants: - - whql_client_install: + - client_install: type = whql_client_install dsso_delete_machine_binary = deps/whql_delete_machine_15.exe # The username and password are required for accessing the DTM client @@ -360,7 +360,7 @@ variants: # (the final cmd will be something like \\servername\DTMInstall\...) install_cmd = \DTMInstall\Client\Setup.exe /passive install_timeout = 3600 - - whql_submission: whql_client_install + - submission: client_install type = whql_submission extra_params += " -snapshot" dsso_test_binary = deps/whql_submission_15.exe @@ -1714,7 +1714,7 @@ variants: virtio_oemsetup_id = WXP32 virtio_network_path = 'F:\NetKVM\xp\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows XP desc_path_desc2 = $\WDK\Logo Type\Systems Logo\Windows XP dd_data_logoarch = X86 @@ -1744,7 +1744,7 @@ variants: virtio_oemsetup_id = WNET64 virtio_network_path = 'F:\NetKVM\xp\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows XP desc_path_desc2 = $\WDK\Logo Type\Systems Logo\Windows XP dd_data_logoarch = AMD64 @@ -1779,7 +1779,7 @@ variants: virtio_oemsetup_id = WNET32 virtio_network_path = 'F:\NetKVM\2k3\x86' #virtio_network_installer_path = 'F:\RHEV-Network32.msi' - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows Server 2003 dd_data_logoarch = X86 dd_data_logoos = Windows Server 2003 @@ -1809,7 +1809,7 @@ variants: virtio_network_path = 'F:\NetKVM\2k3\amd64' #virtio_network_installer_path = 'F:\RHEV-Network64.msi' - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows Server 2003 dd_data_logoarch = AMD64 dd_data_logoos = Windows Server 2003 @@ -1819,14 +1819,14 @@ variants: - WinVista: image_name = winvista image_size = 20G - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Vista Client\Device Premium desc_path_desc2 = $\WDK\Logo Type\Device Logo\Vista Client\Device Standard desc_path_desc3 = $\WDK\Logo Type\Device Logo\Vista Client variants: - 32: - whql_submission: + whql.submission: dd_data_logoarch = X86 dd_data_logoos = Windows Vista dd_data_whqlos = Windows Vista Client @@ -1872,7 +1872,7 @@ variants: #virtio_network_installer_path = 'F:\RHEV-Network32.msi' - 64: - whql_submission: + whql.submission: dd_data_logoarch = AMD64 dd_data_logoos = Windows Vista dd_data_whqlos = Windows Vista Client x64 @@ -2029,7 +2029,7 @@ variants: - Win7: image_name = win7 image_size = 20G - whql_submission: + whql.submission: desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows 7 Client\Logo desc_path_desc2 = $\WDK\Logo Type\Device Logo\Windows 7 Client device_data += " adq" @@ -2053,7 +2053,7 @@ 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: + whql.submission: dd_data_logoarch = X86 dd_data_logoos = Windows 7 dd_data_whqlos = Windows 7 Client @@ -2083,7 +2083,7 @@ 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: + whql.submission: dd_data_logoarch = AMD64 dd_data_logoos = Windows 7 dd_data_whqlos = Windows 7 Client x64