From patchwork Mon Jul 13 19:26:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 35428 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 n6DJRE7x015470 for ; Mon, 13 Jul 2009 19:27:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755032AbZGMT1M (ORCPT ); Mon, 13 Jul 2009 15:27:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754919AbZGMT1F (ORCPT ); Mon, 13 Jul 2009 15:27:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:52433 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754715AbZGMT1D (ORCPT ); Mon, 13 Jul 2009 15:27:03 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6DJR3ME023756; Mon, 13 Jul 2009 15:27:03 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6DJR1o6010699; Mon, 13 Jul 2009 15:27:02 -0400 Received: from localhost.localdomain (vpn-10-112.bos.redhat.com [10.16.10.112]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6DJQwPe006846; Mon, 13 Jul 2009 15:27:00 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 2/2] KVM test: Make better documentation of the KVM install test params Date: Mon, 13 Jul 2009 16:26:57 -0300 Message-Id: <1247513217-21075-2-git-send-email-lmr@redhat.com> In-Reply-To: <1247513217-21075-1-git-send-email-lmr@redhat.com> References: <1247513217-21075-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In order to improve understanding of the KVM test control, made comments on the kvm_install params dictionary, with all modes supported and examples of usage. Also, commented out parameters that are not going to be used by the default set on that file (KVM install using release tarball). Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/control | 53 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/client/tests/kvm/control b/client/tests/kvm/control index c030a14..83a1a5f 100644 --- a/client/tests/kvm/control +++ b/client/tests/kvm/control @@ -84,26 +84,53 @@ link_if_not_exist(pwd, images, 'images') link_if_not_exist(pwd, qemu, 'qemu') link_if_not_exist(pwd, qemu_img, 'qemu-img') -# --------------------- -# Build and install kvm -# --------------------- +# -------------------------------------------------------- +# Params that will be passed to the KVM install/build test +# -------------------------------------------------------- params = { "name": "kvm_install", "shortname": "kvm_install", "type": "kvm_install", "mode": "release", - - ## Install from a tarball - "tarball": "/tmp/kvm-84.tar.gz", - - ## Install from a kvm release. - "release_dir": 'http://downloads.sourceforge.net/kvm/', + #"mode": "snapshot", + #"mode": "localtar", + #"mode": "localsrc", + #"mode": "git", + + ## Are we going to load modules built by this test? + ## Defaults to 'yes', so if you are going to provide only userspace code to + ## be built by this test, please set load_modules to 'no', and make sure + ## the kvm and kvm-[vendor] module is already loaded by the time you start + ## it. + #"load_modules": "no", + + ## Install from a kvm release ("mode": "release"). You can optionally + ## specify a release tag. If you omit it, the test will get the latest + ## release tag available. #"release_tag": '84', + "release_dir": 'http://downloads.sourceforge.net/kvm/', - ## 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/virt/kvm/qemu-kvm.git', - "kmod_repo": 'git://git.kernel.org/pub/scm/virt/kvm/kvm-kmod.git' + ## Install from a kvm snapshot location ("mode": "snapshot"). You can + ## optionally specify a snapshot date. If you omit it, the test will get + ## yesterday's snapshot. + #"snapshot_date": '20090712' + #"snapshot_dir": 'http://foo.org/kvm-snapshots/', + + ## Install from a tarball ("mode": "localtar") + #"tarball": "/tmp/kvm-84.tar.gz", + + ## Install from a local source code dir ("mode": "localsrc") + #"srcdir": "/path/to/source-dir" + + ## Install from git ("mode": "git") + ## If you provide only "git_repo" and "user_git_repo", the build test + ## will assume it will perform all build from the userspace dir, building + ## modules trough make -C kernel LINUX=%s sync. As of today (07-13-2009) + ## we need 3 git repos, "git_repo" (linux sources), "user_git_repo" and + ## "kmod_repo" to build KVM userspace + kernel modules. + #"git_repo": 'git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git', + #"user_git_repo": 'git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git', + #"kmod_repo": 'git://git.kernel.org/pub/scm/virt/kvm/kvm-kmod.git' } # Comment the job.run_test line if you do not want to install kvm on the host.