From patchwork Mon May 11 15:51:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Burns X-Patchwork-Id: 23010 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4BFpM05014938 for ; Mon, 11 May 2009 15:51:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754347AbZEKPvG (ORCPT ); Mon, 11 May 2009 11:51:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753111AbZEKPvF (ORCPT ); Mon, 11 May 2009 11:51:05 -0400 Received: from mx1.redhat.com ([66.187.233.31]:47070 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753108AbZEKPvC (ORCPT ); Mon, 11 May 2009 11:51:02 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n4BFp32T009045 for ; Mon, 11 May 2009 11:51:03 -0400 Received: from mburns.csb (vpn-10-105.bos.redhat.com [10.16.10.105]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n4BFp2gU012538; Mon, 11 May 2009 11:51:02 -0400 Received: by mburns.csb (Postfix, from userid 13432) id 8BFBDA8412; Mon, 11 May 2009 11:51:01 -0400 (EDT) From: Mike Burns To: kvm@vger.kernel.org Cc: ulublin@redhat.com, Michael Burns Subject: [PATCH][KVM-AUTOTEST] Add custom install option for kvm_install Date: Mon, 11 May 2009 11:51:01 -0400 Message-Id: <1242057061-26755-1-git-send-email-mburns@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Michael Burns Signed-off-by: Michael Burns --- client/tests/kvm_runtest_2/control | 17 ++++++++++++++++- client/tests/kvm_runtest_2/kvm_install.py | 13 +++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm_runtest_2/control b/client/tests/kvm_runtest_2/control index fd68e94..5d022b5 100644 --- a/client/tests/kvm_runtest_2/control +++ b/client/tests/kvm_runtest_2/control @@ -41,6 +41,18 @@ link_if_not_exist(pwd, qemu_img, 'qemu-img') # --------------------- # Build and install kvm +# +# Details of Install options +# Mode: custom +# Description: install from custom install script +# Parameters needed: +# install_script: +# location of script relative to the +# kvm-autotest/client directory +# Note: For custom parameters for your script, define them as params below. +# They will be available as KVM_INSTALL_ in the OS environment +# Example: install_script will be available as KVM_INSTALL_install_script +# # --------------------- params = { "name": "kvm_install", @@ -57,7 +69,10 @@ params = { ## Install from git "git_repo": 'git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git', - "user_git_repo": 'git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git' + "user_git_repo": 'git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git', + + ## Custom install + "install_script": 'tests/kvm_runtest_2/custom_kvm_install.sh' } # Comment the job.run_test line if you do not want to install kvm on the host. diff --git a/client/tests/kvm_runtest_2/kvm_install.py b/client/tests/kvm_runtest_2/kvm_install.py index 8be5a93..bb664b3 100755 --- a/client/tests/kvm_runtest_2/kvm_install.py +++ b/client/tests/kvm_runtest_2/kvm_install.py @@ -77,6 +77,19 @@ def run_kvm_install(test, params, env): elif install_mode == "localsrc": __install_kvm(test, srcdir) + # install from custom script + elif install_mode == "custom": + install_script = params.get("install_script") + script = os.path.join(os.environ['AUTODIR'],install_script) + if not install_script: + message = "Custom script filename not specified" + kvm_log.error(message) + raise error.TestError, message + for k in params.keys(): + os.putenv("KVM_INSTALL_%s" % (k), str(params[k])) + kvm_log.info("Running " + script + " to install kvm") + os.system(script) + # invalid installation mode else: message = "Invalid installation mode: '%s'" % install_mode