Skip to contentSkip to conversation

KVM test: Not execute build test by default

PATCH In review Lucas Meneghel Rodrigues 3 participants 4 messages Dec 1, 2009 – Dec 2, 2009 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM test: Not execute build test by default

Instead of trying to build KVM using one of the methods defined on the control file, use "noinstall" as the default mode, and make "noinstall" entirely skip the build test, as having "noinstall" as one of the options for the build test was making the test to run, calling the kvm preprocessor and killing VMs that could be present on the environment, an undesirable situation.

This is an intermediate step before we carry over with the control file cleanup.

---
 client/tests/kvm/control          |   20 ++++++++++----------
 client/tests/kvm/control.parallel |   20 ++++++++++----------
 client/tests/kvm/tests/build.py   |    5 +----
 3 files changed, 21 insertions(+), 24 deletions(-)
client/tests/kvm/control +10 -10
index cff9965..a526cc0 100644
@@ -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
client/tests/kvm/control.parallel +10 -10
index 99f6556..343f694 100644
@@ -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
client/tests/kvm/tests/build.py +1 -4
index 5fffac6..d22d59b 100644
@@ -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)
Signature · 1 line
1.6.5.2
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Lucas Meneghel Rodrigues

Instead of trying to build KVM using one of the methods defined on the control file, use "noinstall" as the default mode, and make "noinstall" entirely skip the build test, as having "noinstall" as one of the options for the build test was making the test to run, calling the kvm preprocessor and killing VMs that could be present on the environment, an undesirable situation.

Quoted 4 lines

This is an intermediate step before we carry over with the control file cleanup.

Yeah, I like noinstall as a default.

Signature · 4 lines
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
[email protected]
#2 lore raw
Quoted 9 lines · Ryan Harper
Quoted 8 lines · Lucas Meneghel Rodrigues

Instead of trying to build KVM using one of the methods defined on the control file, use "noinstall" as the default mode, and make "noinstall" entirely skip the build test, as having "noinstall" as one of the options for the build test was making the test to run, calling the kvm preprocessor and killing VMs that could be present on the environment, an undesirable situation.

Quoted 6 lines
Quoted 4 lines

This is an intermediate step before we carry over with the control file cleanup.

Yeah, I like noinstall as a default.

Definitely good, but I will prefer a name like no_kvm_install.

Quoted 13 lines

--
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
[email protected]
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Signature · 1 line
Sudhir Kumar