From patchwork Thu Oct 4 10:29:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Zupka X-Patchwork-Id: 1545961 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A8E3A3FC1A for ; Thu, 4 Oct 2012 10:29:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753630Ab2JDK3m (ORCPT ); Thu, 4 Oct 2012 06:29:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8240 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063Ab2JDK3k (ORCPT ); Thu, 4 Oct 2012 06:29:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q94ATJC3022505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Oct 2012 06:29:19 -0400 Received: from jzupka-pc.local.com (vpn1-5-104.ams2.redhat.com [10.36.5.104]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q94ATAqj030456; Thu, 4 Oct 2012 06:29:17 -0400 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=BDupka?= To: autotest@test.kernel.org, kvm@vger.kernel.org, kvm-autotest@redhat.com, lmr@redhat.com, ldoktor@redhat.com, jzupka@redhat.com Subject: [virt][PATCH 4/4] virt: Adds multihost machine type test variants. Date: Thu, 4 Oct 2012 12:29:08 +0200 Message-Id: <1349346548-25288-5-git-send-email-jzupka@redhat.com> In-Reply-To: <1349346548-25288-1-git-send-email-jzupka@redhat.com> References: <1349346548-25288-1-git-send-email-jzupka@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch groups multihost test into one group to which is added machine types variant of test. Signed-off-by: Ji?í Župka --- kvm/cfg/multi-host-tests.cfg.sample | 6 +- shared/cfg/subtests.cfg.sample | 164 ++++++++++++++++++++++------------- 2 files changed, 107 insertions(+), 63 deletions(-) diff --git a/kvm/cfg/multi-host-tests.cfg.sample b/kvm/cfg/multi-host-tests.cfg.sample index bc0ce03..d47e756 100644 --- a/kvm/cfg/multi-host-tests.cfg.sample +++ b/kvm/cfg/multi-host-tests.cfg.sample @@ -21,7 +21,8 @@ variants: only no_pci_assignable only no_9p_export only smallpages - only Fedora.15.64 + only pc + only Fedora.17.64 only migrate_multi_host # Runs qemu, f16 64 bit guest OS, install, boot, shutdown @@ -37,7 +38,8 @@ variants: only no_pci_assignable only no_9p_export only smallpages - only Fedora.15.64 + only pc + only Fedora.17.64 only cpuflags_multi_host only qemu_migrate_multi_host diff --git a/shared/cfg/subtests.cfg.sample b/shared/cfg/subtests.cfg.sample index ab62e12..957bb9c 100644 --- a/shared/cfg/subtests.cfg.sample +++ b/shared/cfg/subtests.cfg.sample @@ -960,52 +960,111 @@ variants: - monotonic_time: test_control_file = monotonic_time.control - - migrate_multi_host: install setup image_copy unattended_install.cdrom - type = migration_multi_host - vms = "vm1" - start_vm = no - migration_test_command = help - migration_bg_command = "cd /tmp; nohup tcpdump -q -i any -t ip host localhost" - migration_bg_check_command = pgrep tcpdump - migration_bg_kill_command = pkill tcpdump - kill_vm_on_error = yes - iterations = 2 - used_mem = 1024 - mig_timeout = 4800 - disk_prepare_timeout = 360 - comm_port = 13234 - regain_ip_cmd = killall dhclient; sleep 10; dhclient; + - @multi_host: variants: - #Migration protocol. - -tcp: + - migrate_multi_host: install setup image_copy unattended_install.cdrom + type = migration_multi_host + vms = "vm1" + start_vm = no + migration_test_command = help + migration_bg_command = "cd /tmp; nohup tcpdump -q -i any -t ip host localhost" + migration_bg_check_command = pgrep tcpdump + migration_bg_kill_command = pkill tcpdump + kill_vm_on_error = yes + iterations = 2 + used_mem = 1024 + mig_timeout = 4800 + disk_prepare_timeout = 360 + comm_port = 13234 + regain_ip_cmd = killall dhclient; sleep 10; dhclient; variants: - - @default: - type = migration_multi_host - - measure_migration_speed: - only Linux - mig_speed = 1G - type = migration_multi_host_with_speed_measurement - -fd: - type = migration_multi_host_fd - - - migration_multi_host_with_file_transfer: install setup image_copy unattended_install.cdrom - type = migration_multi_host_with_file_transfer - vms = "vm1" - start_vm = no - kill_vm_on_error = yes - used_mem = 1024 - mig_timeout = 4800 - disk_prepare_timeout = 360 - comm_port = 13234 - #path where file is stored on guest. - guest_path = "/tmp/file" - #size of generated file. - file_size = 500 - transfer_timeout = 240 - #Transfer speed in Mb - transfer_speed = 100 - #Count of migration during file transfer. - migrate_count = 3 + #Migration protocol. + -tcp: + variants: + - @default: + type = migration_multi_host + - measure_migration_speed: + only Linux + mig_speed = 1G + type = migration_multi_host_with_speed_measurement + -fd: + type = migration_multi_host_fd + + - migration_multi_host_with_file_transfer: install setup image_copy unattended_install.cdrom + type = migration_multi_host_with_file_transfer + vms = "vm1" + start_vm = no + kill_vm_on_error = yes + used_mem = 1024 + mig_timeout = 4800 + disk_prepare_timeout = 360 + comm_port = 13234 + #path where file is stored on guest. + guest_path = "/tmp/file" + #size of generated file. + file_size = 500 + transfer_timeout = 240 + #Transfer speed in Mb + transfer_speed = 100 + #Count of migration during file transfer. + migrate_count = 3 + + - cpuflags_multi_host: + type = cpuflags + test_type = test_multi_host_migration + vms = "vm1" + start_vm = no + #Try to start guest with all flags which are supported by host. + all_host_supported_flags = "no" + cpu_model = "core2duo:sse3" + guest_spec_flags = "fxsr_opt hypervisor ds pdpe1gb osxsave svm" + host_spec_flags = "pbe tm ds_cpl monitor acpi dtes64 ht tm2 xtpr est pdcm smx" + mig_timeout = 4800 + kill_vm_on_error = yes + disk_prepare_timeout = 360 + comm_port = 13234 + regain_ip_cmd = killall dhclient; sleep 10; dhclient; + auto_cpu_model = no + + only default_machine_types + # For RHEL machine type. + #only rhel_machine_types + + variants: + - @default_machine_types: + variants: + -@pc: + machine_type = "pc" + -pc-0.14: + machine_type = "pc-0.14" + -pc-0.13: + machine_type = "pc-0.13" + -pc-0.12: + machine_type = "pc-0.12" + -pc-0.11: + machine_type = "pc-0.11" + -pc-0.10: + machine_type = "pc-0.10" + -isapc: + machine_type = "isapc" + + - @rhel_machine_types: + variants: + -@pc: + machine_type = "pc" + - rhel5.4.0: + machine_type = "rhel5.4.0" + - rhel5.4.4: + machine_type = "rhel5.4.4" + - rhel5.5.0: + machine_type = "rhel5.5.0" + - rhel6.0.0: + machine_type = "rhel6.0.0" + - rhel6.2.0: + machine_type = "rhel6.2.0" + - rhel6.3.0: + machine_type = "rhel6.3.0" + - boot_savevm: install setup image_copy unattended_install.cdrom type = boot_savevm @@ -2515,23 +2574,6 @@ variants: - qemu_test_migration_with_additional_flags: test_type = "test_migration_with_additional_flags" - - cpuflags_multi_host: - type = cpuflags - test_type = test_multi_host_migration - vms = "vm1" - start_vm = no - #Try to start guest with all flags which are supported by host. - all_host_supported_flags = "no" - cpu_model = "core2duo:sse3" - guest_spec_flags = "fxsr_opt hypervisor ds pdpe1gb osxsave svm" - host_spec_flags = "pbe tm ds_cpl monitor acpi dtes64 ht tm2 xtpr est pdcm smx" - mig_timeout = 4800 - kill_vm_on_error = yes - disk_prepare_timeout = 360 - comm_port = 13234 - regain_ip_cmd = killall dhclient; sleep 10; dhclient; - auto_cpu_model = no - - cpu_hotplug_test: install setup image_copy unattended_install.cdrom type = cpu_hotplug cpu_hotplug_timeout = 600