From patchwork Sat Jan 22 01:30:46 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: 497481 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 p0M1VEZ4022962 for ; Sat, 22 Jan 2011 01:31:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753070Ab1AVBbC (ORCPT ); Fri, 21 Jan 2011 20:31:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19363 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342Ab1AVBa5 (ORCPT ); Fri, 21 Jan 2011 20:30:57 -0500 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.13.8/8.13.8) with ESMTP id p0M1UuRf003430 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Jan 2011 20:30:56 -0500 Received: from freedom.redhat.com (vpn-11-112.rdu.redhat.com [10.11.11.112]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p0M1Up5M007822; Fri, 21 Jan 2011 20:30:54 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 2/6] KVM test: Make unattended _install use the new pre script Date: Fri, 21 Jan 2011 23:30:46 -0200 Message-Id: <1295659850-29609-2-git-send-email-lmr@redhat.com> In-Reply-To: <1295659850-29609-1-git-send-email-lmr@redhat.com> References: <1295659850-29609-1-git-send-email-lmr@redhat.com> 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 22 Jan 2011 01:31:15 +0000 (UTC) diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index 41455cf..12adb6a 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -1,7 +1,7 @@ import sys, os, time, commands, re, logging, signal, glob, threading, shutil from autotest_lib.client.bin import test, utils from autotest_lib.client.common_lib import error -import kvm_vm, kvm_utils, kvm_subprocess, kvm_monitor, ppm_utils +import kvm_vm, kvm_utils, kvm_subprocess, kvm_monitor, ppm_utils, test_setup try: import PIL.Image except ImportError: @@ -258,6 +258,10 @@ def preprocess(test, params, env): h = kvm_utils.HugePageConfig(params) h.setup() + if params.get("type") == "unattended_install": + u = test_setup.UnattendedInstallConfig(test, params) + u.setup() + # Execute any pre_commands if params.get("pre_command"): process_command(test, params, env, params.get("pre_command"), diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 184a582..c727c32 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -97,7 +97,6 @@ variants: kill_vm_gracefully = yes kill_vm_on_error = yes force_create_image = yes - pre_command += " scripts/unattended.py;" extra_params += " -boot d" guest_port_unattended_install = 12323 kernel = vmlinuz @@ -381,7 +380,6 @@ variants: # The support VM is identical to the tested VM in every way # except for the image name which ends with '-supportvm'. type = unattended_install - pre_command += " scripts/unattended.py;" extra_params += " -boot d" force_create_image = yes kill_vm = yes