From patchwork Fri Jan 29 06:07:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 75659 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o0T67luB002640 for ; Fri, 29 Jan 2010 06:07:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751496Ab0A2GHp (ORCPT ); Fri, 29 Jan 2010 01:07:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751508Ab0A2GHp (ORCPT ); Fri, 29 Jan 2010 01:07:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53442 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406Ab0A2GHo (ORCPT ); Fri, 29 Jan 2010 01:07:44 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0T67hg1028629 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Jan 2010 01:07:44 -0500 Received: from localhost.localdomain (vpn-11-140.rdu.redhat.com [10.11.11.140]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0T67YZd012118; Fri, 29 Jan 2010 01:07:42 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 3/6] KVM test: Make sure reset and shutdown are the last ones Date: Fri, 29 Jan 2010 04:07:29 -0200 Message-Id: <1264745252-14077-3-git-send-email-lmr@redhat.com> In-Reply-To: <1264745252-14077-2-git-send-email-lmr@redhat.com> References: <1264745252-14077-1-git-send-email-lmr@redhat.com> <1264745252-14077-2-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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 (demeter.kernel.org [140.211.167.41]); Fri, 29 Jan 2010 06:07:48 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 8a7a13d..fdd04cb 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -236,6 +236,24 @@ variants: - fmt_raw: image_format_stg = raw + - vlan_tag: install setup unattended_install + type = vlan_tag + # subnet should not be used by host + subnet = 192.168.123 + vlans = "10 20" + nic_mode = tap + vms += " vm2" + extra_params_vm1 += " -snapshot" + extra_params_vm2 += " -snapshot" + kill_vm_gracefully_vm2 = no + address_index_vm2 = 1 + + - physical_resources_check: install setup unattended_install + type = physical_resources_check + catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}' + + # system_reset, system_powerdown and shutdown *must* be the last ones + # defined, since the effect of such tests can leave the VM on a bad state. - system_reset: install setup unattended_install type = boot reboot_method = system_reset @@ -254,22 +272,7 @@ variants: shutdown_method = shell kill_vm = yes kill_vm_gracefully = no - - - vlan_tag: install setup unattended_install - type = vlan_tag - # subnet should not be used by host - subnet = 192.168.123 - vlans = "10 20" - nic_mode = tap - vms += " vm2" - extra_params_vm1 += " -snapshot" - extra_params_vm2 += " -snapshot" - kill_vm_gracefully_vm2 = no - address_index_vm2 = 1 - - - physical_resources_check: install setup unattended_install - type = physical_resources_check - catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}' + # Do not define test variants below shutdown # NICs variants: