From patchwork Wed Aug 12 15:59:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 40909 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7CFwLLT005478 for ; Wed, 12 Aug 2009 15:58:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754028AbZHLP50 (ORCPT ); Wed, 12 Aug 2009 11:57:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754018AbZHLP5Z (ORCPT ); Wed, 12 Aug 2009 11:57:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42763 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754006AbZHLP5X (ORCPT ); Wed, 12 Aug 2009 11:57:23 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7CFvOS8005528; Wed, 12 Aug 2009 11:57:24 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7CFvNa2004546; Wed, 12 Aug 2009 11:57:24 -0400 Received: from localhost.localdomain (dhcp-1-31.tlv.redhat.com [10.35.1.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7CFvFCH029667; Wed, 12 Aug 2009 11:57:22 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH v2 05/11] KVM test: specify installation cdkeys in a dedicated file Date: Wed, 12 Aug 2009 18:59:57 +0300 Message-Id: <05eac6f84757616309273b01ac4d8800efbdb083.1250091576.git.mgoldish@redhat.com> In-Reply-To: References: <1250092803-32477-1-git-send-email-mgoldish@redhat.com> <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.git.mgoldish@redhat.com> <42ceeed70c7c1ec9f4d78d91d67a290f3ac11e6e.1250091576.git.mgoldish@redhat.com> <8284ff0173612b63412132bb8c864f2c8a258b55.1250091576.git.mgoldish@redhat.com> In-Reply-To: <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.git.mgoldish@redhat.com> References: <10a541e518180735e86a4dbc8e759912d0ec314c.1250091576.git.mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org - Add file kvm_cdkeys.cfg.sample which specifies cdkeys for guests that require them. Users should rename the file to kvm_cdkeys.cfg and enter the real cdkeys in the file. - Remove all cdkey lines from kvm_tests.cfg.sample and add an include statement instead ('include kvm_cdkeys.cfg'). Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_cdkeys.cfg.sample | 16 ++++++++++++++++ client/tests/kvm/kvm_tests.cfg.sample | 10 +++------- 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 client/tests/kvm/kvm_cdkeys.cfg.sample diff --git a/client/tests/kvm/kvm_cdkeys.cfg.sample b/client/tests/kvm/kvm_cdkeys.cfg.sample new file mode 100644 index 0000000..60bfe59 --- /dev/null +++ b/client/tests/kvm/kvm_cdkeys.cfg.sample @@ -0,0 +1,16 @@ +# Rename this file to kvm_cdkeys.cfg. +# Replace the 'CDKEY' strings with real cdkeys where necessary. +# Guests that do not require cdkeys by default are commented out. +# You may uncomment them if necessary. + +RHEL.5.3.i386: cdkey = CDKEY +RHEL.5.3.x86_64: cdkey = CDKEY +Win2000: cdkey = CDKEY +WinXP.32: cdkey = CDKEY +WinXP.64: cdkey = CDKEY +Win2003.32: cdkey = CDKEY +Win2003.64: cdkey = CDKEY +#WinVista.32: cdkey = CDKEY +#WinVista.64: cdkey = CDKEY +#Win2008.32: cdkey = CDKEY +#Win2008.64: cdkey = CDKEY diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 9ad115e..255716a 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -272,7 +272,6 @@ variants: image_name = rhel5-32 install: steps=RHEL-5.3-i386.steps - cdkey=RHEL_INSTALL_NUMBER cdrom=linux/RHEL-5.3-i386-DVD.iso md5sum=371c62851611fd32ead440df6f24a296 md5sum_1m=242318dd44152210f6ff6cdda1bfbf51 @@ -282,7 +281,6 @@ variants: image_name = rhel5-64 install: steps=RHEL-5.3-x86_64.steps - cdkey=RHEL_INSTALL_NUMBER cdrom=linux/RHEL-5.3-x86_64-DVD.iso md5sum=c5ed6b284410f4d8212cafc78fd7a8c5 md5sum_1m=b999f437583098ea5bbd56fb1de1d011 @@ -363,7 +361,6 @@ variants: md5sum = dda6039f3a9173f0f6bfae40f5efdfea md5sum_1m = dd28fba196d366d56fe774bd93df5527 user = user - cdkey = WIN_2000_32_CDKEY setup: steps = Win2000-32-setupssh.steps cdrom = windows/setupssh.iso @@ -376,7 +373,6 @@ variants: md5sum = 743450644b1d9fe97b3cf379e22dceb0 md5sum_1m = b473bf75af2d1269fec8958cf0202bfd user = user - cdkey = WIN_XP_32_CDKEY setup: steps = WinXP-32-setupssh.steps cdrom = windows/setupssh.iso @@ -390,7 +386,6 @@ variants: md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512 md5sum_1m = e812363ff427effc512b7801ee70e513 user = user - cdkey = WIN_XP_64_CDKEY - Win2003: image_size = 20G @@ -406,7 +401,6 @@ variants: md5sum = 03e921e9b4214773c21a39f5c3f42ef7 md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3 user = user - cdkey = WIN_2003_32_CDKEY setup: steps = Win2003-32-setupssh.steps cdrom = windows/setupssh.iso @@ -420,7 +414,6 @@ variants: md5sum = 5703f87c9fd77d28c05ffadd3354dbbd md5sum_1m = 439393c384116aa09e08a0ad047dcea8 user = user - cdkey = WIN_2003_64_CDKEY - WinVista: only install @@ -624,5 +617,8 @@ variants: only rtl8139 +include kvm_cdkeys.cfg + + # Choose your test list only fc8_quick