From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <1295659850-29609-1-git-send-email-lmr@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: autotest@test.kernel.org Return-path: In-Reply-To: <1295659850-29609-1-git-send-email-lmr@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Also, get rid of references to the old unattended install script. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/kvm_preprocessing.py | 6 +++++- client/tests/kvm/tests_base.cfg.sample | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) 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 -- 1.7.3.4