From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: autotest@test.kernel.org
Cc: kvm@vger.kernel.org
Subject: [PATCH 2/6] KVM test: Make unattended _install use the new pre script
Date: Fri, 21 Jan 2011 23:30:46 -0200 [thread overview]
Message-ID: <1295659850-29609-2-git-send-email-lmr@redhat.com> (raw)
In-Reply-To: <1295659850-29609-1-git-send-email-lmr@redhat.com>
Also, get rid of references to the old unattended install
script.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
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
next prev parent reply other threads:[~2011-01-22 1:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-22 1:30 [PATCH 1/6] KVM test: Introducing test_setup library Lucas Meneghel Rodrigues
2011-01-22 1:30 ` Lucas Meneghel Rodrigues [this message]
2011-01-22 1:30 ` [PATCH 3/6] KVM test: Removing scripts/unattended.py Lucas Meneghel Rodrigues
2011-01-22 1:30 ` [PATCH 4/6] KVM config: Move HugePageConfig() to test_setup Lucas Meneghel Rodrigues
2011-01-22 1:30 ` [PATCH 5/6] KVM test: Turn enospc test pre/post actions into infrastructure Lucas Meneghel Rodrigues
2011-01-22 1:30 ` [PATCH 6/6] KVM test: Removing enospc pre and post scripts Lucas Meneghel Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295659850-29609-2-git-send-email-lmr@redhat.com \
--to=lmr@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox