From patchwork Tue Mar 1 21:31: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: 601161 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 p21LVm6Z005975 for ; Tue, 1 Mar 2011 21:31:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755329Ab1CAVbo (ORCPT ); Tue, 1 Mar 2011 16:31:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37928 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754185Ab1CAVbo (ORCPT ); Tue, 1 Mar 2011 16:31:44 -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.14.4/8.14.4) with ESMTP id p21LVgUL003900 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Mar 2011 16:31:42 -0500 Received: from freedom.redhat.com (vpn-9-22.rdu.redhat.com [10.11.9.22]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p21LVevp013323; Tue, 1 Mar 2011 16:31:41 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Define OS specific info in the test variants Date: Tue, 1 Mar 2011 18:31:37 -0300 Message-Id: <1299015097-29604-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]); Tue, 01 Mar 2011 21:31:48 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 661d6fe..eef8c97 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -113,15 +113,18 @@ variants: redirs += " unattended_install" # Install guest from http/ftp url - url: + only Linux medium = url url = REPLACE_THIS_WITH_TREE_URL # Install guest from nfs nfs_server:nfs_dir - nfs: + only Linux medium = nfs nfs_server = REPLACE_THIS_WITH_NFS_SERVER nfs_dir = REPLACE_THIS_WITH_NFS_DIRECTORY # Install guest with a remote kickstart - remote_ks: + only Linux medium = url extra_params = " --append ks=REPLACE_THIS_WITH_URL_OF_KS" url = REPLACE_THIS_WITH_TREE_URL @@ -170,6 +173,7 @@ variants: iterations = 1 type = migration_with_file_transfer - with_autotest: + only Linux type = autotest migrate_background = yes test_timeout = 1800 @@ -204,6 +208,7 @@ variants: kill_vm = yes - autotest: install setup unattended_install.cdrom + only Linux type = autotest test_timeout = 1800 variants: @@ -246,6 +251,7 @@ variants: - linux_s3: install setup unattended_install.cdrom + only Linux type = linux_s3 - timedrift: install setup unattended_install.cdrom @@ -329,6 +335,7 @@ variants: used_mem = 2560 - guest_test: install setup unattended_install.cdrom + only Windows type = guest_test login_timeout = 360 test_timeout = 600 @@ -358,11 +365,13 @@ variants: dst_rsc_path = "C:\powershell\stub\stub.ps1" - iozone_windows: unattended_install.cdrom + only Windows type = iozone_windows iozone_cmd = "D:\IOzone\iozone.exe -a" iozone_timeout = 3600 - whql: install setup unattended_install.cdrom + only Windows nic_mode = tap # Replace this with the address of an installed DTM server server_address = 10.20.30.40 @@ -614,6 +623,7 @@ variants: type = qmp_basic_rhel6 - vlan: install setup unattended_install.cdrom + only Linux type = vlan # subnet should not be used by host subnet = "192.168" @@ -635,6 +645,7 @@ variants: nics += ' nic2' - jumbo: install setup unattended_install.cdrom + only Linux type = jumbo - file_transfer: install setup unattended_install.cdrom @@ -646,6 +657,7 @@ variants: transfer_type = remote - nicdriver_unload: install setup unattended_install.cdrom + only Linux type = nicdriver_unload nic_mode = tap filesize = 100 @@ -654,12 +666,14 @@ variants: sessions_num = 10 - nic_promisc: install setup unattended_install.cdrom + only Linux type = nic_promisc filesize = 400 transfer_timeout = 100 transfer_type = remote - multicast: install setup unattended_install.cdrom + only Linux type = multicast nic_mode = tap mcast = 225.0.0.1 @@ -680,10 +694,12 @@ variants: pxe_timeout = 60 - mac_change: install setup unattended_install.cdrom + only Linux type = mac_change kill_vm = yes - netperf: install setup unattended_install.cdrom + only Linux type = netperf nic_mode = tap netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch @@ -699,11 +715,13 @@ variants: protocols = "TCP_RR TCP_CRR UDP_RR" - ethtool: install setup unattended_install.cdrom + only Linux type = ethtool filesize = 512 nic_mode = tap - nic_bonding: + only Linux type = nic_bonding nics += ' nic2 nic3 nic4' image_snapshot = yes @@ -729,6 +747,7 @@ variants: catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}' - ksm_overcommit: + only Linux # Don't preprocess any vms as we need to change its params vms = '' image_snapshot = yes @@ -751,9 +770,11 @@ variants: ksm_mode = "parallel" - iofuzz: + only Linux type = iofuzz - virtio_console: + only Linux vms = '' type = virtio_console # smoke params - $console_type:data_string @@ -809,6 +830,7 @@ variants: take_regular_screendumps = no - ioquit: + only Linux type = ioquit background_cmd = "for i in 1 2 3 4; do (dd if=/dev/urandom of=/tmp/file bs=102400 count=10000000 &); done" check_cmd = ps -a |grep dd @@ -857,13 +879,16 @@ variants: image_name_snapshot2 = sn2 - clock_getres: install setup unattended_install.cdrom + only Linux type = clock_getres - yum_update: install setup unattended_install.cdrom + only Fedora, RHEL type = yum_update shell_prompt = "Is this ok" - kdump: unattended_install.cdrom + only Linux type = kdump # time waited for the completion of crash dump # crash_timeout = 360 @@ -945,7 +970,6 @@ variants: variants: # Linux section - @Linux: - no autoit iozone_windows whql shutdown_command = shutdown -h now reboot_command = shutdown -r now status_test_command = echo $? @@ -1736,9 +1760,6 @@ variants: # Windows section - @Windows: - no autotest, linux_s3, vlan, ioquit, unattended_install.url, unattended_install.nfs, unattended_install.remote_ks - no jumbo, nicdriver_unload, nic_promisc, multicast, mac_change, ethtool, clock_getres - shutdown_command = shutdown /s /f /t 0 reboot_command = shutdown /r /f /t 0 status_test_command = echo %errorlevel%