From patchwork Tue Dec 1 23:07:56 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: 64066 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 nB1N8IIA008229 for ; Tue, 1 Dec 2009 23:08:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441AbZLAXIF (ORCPT ); Tue, 1 Dec 2009 18:08:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753456AbZLAXIF (ORCPT ); Tue, 1 Dec 2009 18:08:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55247 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbZLAXHz (ORCPT ); Tue, 1 Dec 2009 18:07:55 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB1N81dp030445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Dec 2009 18:08:01 -0500 Received: from localhost.localdomain (vpn-9-160.rdu.redhat.com [10.11.9.160]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB1N7xHT008646; Tue, 1 Dec 2009 18:07:59 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Not execute build test by default Date: Tue, 1 Dec 2009 21:07:56 -0200 Message-Id: <1259708876-30251-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/control b/client/tests/kvm/control index cff9965..a526cc0 100644 --- a/client/tests/kvm/control +++ b/client/tests/kvm/control @@ -75,12 +75,12 @@ params = { "name": "build", "shortname": "build", "type": "build", - "mode": "release", + #"mode": "release", #"mode": "snapshot", #"mode": "localtar", #"mode": "localsrc", #"mode": "git", - #"mode": "noinstall", + "mode": "noinstall", #"mode": "koji", ## Are we going to load modules built by this test? @@ -88,15 +88,15 @@ params = { ## 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", + #"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/project/kvm/', + #"release_dir": 'http://downloads.sourceforge.net/project/kvm/', # This is the place that contains the sourceforge project list of files - "release_listing": 'http://sourceforge.net/projects/kvm/files/', + #"release_listing": 'http://sourceforge.net/projects/kvm/files/', ## Install from a kvm snapshot location ("mode": "snapshot"). You can ## optionally specify a snapshot date. If you omit it, the test will get @@ -151,11 +151,11 @@ params = { # /tmp/kvm-autotest-root/qemu is a link to your existing executable. Note that # if kvm_install is chose to run, it overwrites existing qemu and qemu-img # links to point to the newly built executables. -r = True -r = job.run_test("kvm", params=params, tag=params.get("shortname")) -if not r: - print 'kvm_installation failed ... exiting' - sys.exit(1) + +if not params.get("mode") == "noinstall": + if not job.run_test("kvm", params=params, tag=params.get("shortname")): + print 'kvm_installation failed ... exiting' + sys.exit(1) # ---------------------------------------------------------- # Get test set (dictionary list) from the configuration file diff --git a/client/tests/kvm/control.parallel b/client/tests/kvm/control.parallel index 99f6556..343f694 100644 --- a/client/tests/kvm/control.parallel +++ b/client/tests/kvm/control.parallel @@ -73,12 +73,12 @@ params = { "name": "build", "shortname": "build", "type": "build", - "mode": "release", + #"mode": "release", #"mode": "snapshot", #"mode": "localtar", #"mode": "localsrc", #"mode": "git", - #"mode": "noinstall", + "mode": "noinstall", #"mode": "koji", ## Are we going to load modules built by this test? @@ -86,15 +86,15 @@ params = { ## 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", + #"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/project/kvm/', + #"release_dir": 'http://downloads.sourceforge.net/project/kvm/', # This is the place that contains the sourceforge project list of files - "release_listing": 'http://sourceforge.net/projects/kvm/files/', + #"release_listing": 'http://sourceforge.net/projects/kvm/files/', ## Install from a kvm snapshot location ("mode": "snapshot"). You can ## optionally specify a snapshot date. If you omit it, the test will get @@ -149,11 +149,11 @@ params = { # /tmp/kvm-autotest-root/qemu is a link to your existing executable. Note that # if kvm_install is chose to run, it overwrites existing qemu and qemu-img # links to point to the newly built executables. -r = True -r = job.run_test("kvm", params=params, tag=params.get("shortname")) -if not r: - print 'kvm_installation failed ... exiting' - sys.exit(1) + +if not params.get("mode") == "noinstall": + if not job.run_test("kvm", params=params, tag=params.get("shortname")): + print 'kvm_installation failed ... exiting' + sys.exit(1) # ---------------------------------------------------------- # Get test set (dictionary list) from the configuration file diff --git a/client/tests/kvm/tests/build.py b/client/tests/kvm/tests/build.py index 5fffac6..d22d59b 100644 --- a/client/tests/kvm/tests/build.py +++ b/client/tests/kvm/tests/build.py @@ -568,10 +568,7 @@ def run_build(test, params, env): srcdir = params.get("srcdir", test.srcdir) params["srcdir"] = srcdir - if install_mode == 'noinstall': - logging.info("Skipping installation") - return - elif install_mode in ['localsrc', 'localtar', 'release', 'snapshot']: + if install_mode in ['localsrc', 'localtar', 'release', 'snapshot']: installer = SourceDirInstaller(test, params) elif install_mode == 'git': installer = GitInstaller(test, params)