From patchwork Tue Jan 19 14:14:50 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: 73882 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0JEF1Jo013472 for ; Tue, 19 Jan 2010 14:15:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828Ab0ASOO5 (ORCPT ); Tue, 19 Jan 2010 09:14:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751439Ab0ASOO5 (ORCPT ); Tue, 19 Jan 2010 09:14:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19451 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113Ab0ASOO4 (ORCPT ); Tue, 19 Jan 2010 09:14:56 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0JEEtBp029761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 19 Jan 2010 09:14:56 -0500 Received: from localhost.localdomain (vpn-9-147.rdu.redhat.com [10.11.9.147]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0JEErq9027156; Tue, 19 Jan 2010 09:14:54 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 1/2] KVM test: Make sure setup does not execute on unattended install Date: Tue, 19 Jan 2010 12:14:50 -0200 Message-Id: <1263910491-2788-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index c6a66a4..72a5d76 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -60,7 +60,7 @@ variants: only WinXP.32 no install setup no hugepages - only unattended_install setup boot shutdown + only unattended_install boot shutdown only rtl8139 - @fc11_kickstart: only qemu-kvm diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 0ab7823..15d137f 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -53,8 +53,17 @@ variants: kill_vm_timeout = 60 kill_vm_timeout_on_error = 0 + - setup: install + type = steps + fail_if_stuck_for = 300 + stuck_detection_history = 2 + kill_vm_on_error = yes + keep_screendump_history = yes + - unattended_install: type = unattended_install + # Unattended install also perform guest setup, so setup is not needed + no setup kill_vm_on_error = yes force_create_image = yes pre_command = scripts/unattended.py @@ -62,13 +71,6 @@ variants: extra_params += " -boot d" nic_mode = user - - setup: install unattended_install - type = steps - fail_if_stuck_for = 300 - stuck_detection_history = 2 - kill_vm_on_error = yes - keep_screendump_history = yes - - boot: install setup unattended_install type = boot kill_vm_on_error = yes