From patchwork Mon Jul 25 13:07:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 1004292 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6PD7jxv031091 for ; Mon, 25 Jul 2011 13:07:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504Ab1GYNHm (ORCPT ); Mon, 25 Jul 2011 09:07:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54473 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271Ab1GYNHm (ORCPT ); Mon, 25 Jul 2011 09:07:42 -0400 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.14.4/8.14.4) with ESMTP id p6PD7fMc021366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Jul 2011 09:07:41 -0400 Received: from freedom.redhat.com (vpn-10-121.rdu.redhat.com [10.11.10.121]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6PD7dAr028284; Mon, 25 Jul 2011 09:07:39 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Adding CustomGuest variants Date: Mon, 25 Jul 2011 10:07:37 -0300 Message-Id: <1311599257-25455-1-git-send-email-lmr@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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 25 Jul 2011 13:07:46 +0000 (UTC) In order to help people wanting to use their own, custom guest images with KVM autotest, added CustomGuestLinux and CustomGuestWindows, with comments on how to use lvm devices or other raw block devices as the vm disk. Added an example qemu_kvm_custom_migrate variant that runs all combinations of stress tests (takes approx. 3 hours to run on my development laptop), so people run something actually useful other than simple boot and shutdown tests. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/tests.cfg.sample | 35 ++++++++++++++++++++++++++++++++ client/tests/kvm/tests_base.cfg.sample | 10 +++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index 8e9fb1a..fc088f1 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -5,6 +5,24 @@ include tests_base.cfg include cdkeys.cfg include virtio-win.cfg +# Here you can override the image name for our custom linux and windows guests +# +CustomGuestLinux: + image_name = custom_image_linux + image_size = 10G + # If you want to use a block device as the vm disk, uncomment the 2 lines + # below, pointing the image name for the device you want + #image_name = /dev/mapper/vg_linux_guest + #image_raw_device = yes + +CustomGuestWindows: + image_name = custom_image_windows + image_size = 10G + # If you want to use a block device as the vm disk, uncomment the 2 lines + # below, pointing the image name for the device you want + #image_name = /dev/mapper/vg_windows_guest + #image_raw_device = yes + # Modify/comment the following lines if you wish to modify the paths of the # image files, ISO files or qemu binaries. # @@ -83,6 +101,23 @@ variants: only Fedora.15.64 only unattended_install.cdrom, boot, shutdown + # Runs your own guest image (qcow2, can be adjusted), all migration tests + # (on a core2 duo laptop with HD and 4GB RAM, F15 host took 3 hours to run) + # Be warned, disk stress + migration can corrupt your image, so make sure + # you have proper backups + - @qemu_kvm_custom_migrate: + # We want qemu-kvm for this run + qemu_binary = /usr/bin/qemu-kvm + qemu_img_binary = /usr/bin/qemu-img + only qcow2 + only rtl8139 + only ide + only smp2 + only no_pci_assignable + only smallpages + only CustomGuestLinux + only migrate + # You may provide information about the DTM server for WHQL tests here: #whql: # server_address = 10.20.30.40 diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index e970141..b7342bd 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1216,6 +1216,11 @@ variants: re_str = "[vhs]d[a-z][^0-9]" variants: + - CustomGuestLinux: + image_name = custom_image + image_size = 10G + #image_name = /dev/mapper/vg_some_label + #image_type_raw = yes - Fedora: no setup shell_prompt = "^\[.*\][\#\$]\s*$" @@ -2222,6 +2227,11 @@ variants: pre_cmd = del diskpart.script && (for /L %i in (1 1 23) do echo select disk %i >> diskpart.script && echo create partition primary >> diskpart.script && echo assign >> diskpart.script) && echo select disk 0 >> diskpart.script && echo exit >> diskpart.script && diskpart /s diskpart.script variants: + - CustomGuestWindows: + image_name = custom_image + image_size = 20G + #image_name = /dev/mapper/vg_some_label + #image_type_raw = yes - Win2000: no reboot whql image_name = win2000-32