Skip to contentSkip to conversation

Add custom install option for kvm_install

PATCH In review Mike Burns 2 participants 3 messages May 8, 2009 – May 11, 2009 KVM

lore
Share & tools
lore

Mike Burns

author
#0 lore raw

PATCH 1/1 Add custom install option for kvm_install

From: Michael Burns <[email protected]>

---
 client/tests/kvm_runtest_2/control        |   14 +++++++++++++-
 client/tests/kvm_runtest_2/kvm_install.py |   11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
client/tests/kvm_runtest_2/control +13 -1
index fd68e94..c28dc67 100644
@@ -41,6 +41,15 @@ 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
+#
 # ---------------------
 params = {
     "name": "kvm_install",
@@ -57,7 +66,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/custom_kvm_install.sh'
 }
 
 # Comment the job.run_test line if you do not want to install kvm on the host.
client/tests/kvm_runtest_2/kvm_install.py +11 -0
index 8be5a93..0e077ae 100755
@@ -77,6 +77,17 @@ 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
+	kvm_log.info("Running " + script + " to install kvm")
+        os.system(script)
+
     # invalid installation mode
     else:
         message = "Invalid installation mode: '%s'" % install_mode
Signature · 1 line
1.6.0.6
#1 lore raw

Hi,

Excerpts from Michael Burns's message of Fri May 08 15:55:30 -0300 2009:

Quoted 6 lines
client/tests/kvm_runtest_2/kvm_install.py +0 -0
@@ -77,6 +77,17 @@ def run_kvm_install(test, params, env):
     elif install_mode == "localsrc":
         __install_kvm(test, srcdir)
 

client/tests/kvm_runtest_2/kvm_install.py def run_kvm_install(test, params, env): · line 89

Quoted 10 lines
client/tests/kvm_runtest_2/kvm_install.py +10 -0
+    # 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
+    kvm_log.info("Running " + script + " to install kvm")
+        os.system(script)

What if we had some way to pass the other parameters from 'params' to the custom script?

Maybe something like (untested):

for k in params.keys():

      os.putenv("KVM_INSTALL_%s" % (k), params[k])

Are all values on 'params' guaranteed to be strings, or they can be set to any python value? In the latter case, we could use str(params[k]), or export only the string parameters.

Signature · 1 line
Eduardo
author
#2 lore raw
Quoted 25 lines · Eduardo Habkost

Hi,

Excerpts from Michael Burns's message of Fri May 08 15:55:30 -0300 2009:

Quoted 7 lines
client/tests/kvm_runtest_2/kvm_install.py +1 -0
@@ -77,6 +77,17 @@ def run_kvm_install(test, params, env):
     elif install_mode == "localsrc":
         __install_kvm(test, srcdir)
 
+    # install from custom script

client/tests/kvm_runtest_2/kvm_install.py def run_kvm_install(test, params, env): · line 90

Quoted 10 lines
client/tests/kvm_runtest_2/kvm_install.py +9 -0
+    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
+    kvm_log.info("Running " + script + " to install kvm")
+        os.system(script)
 

What if we had some way to pass the other parameters from 'params' to the custom script?

Quoted 9 lines

Maybe something like (untested):

for k in params.keys():

      os.putenv("KVM_INSTALL_%s" % (k), params[k])

Are all values on 'params' guaranteed to be strings, or they can be set to any python value? In the latter case, we could use str(params[k]), or export only the string parameters.

That's a good idea. I'm not sure about whether the params are all strings. I'll try it out and respin the patch after.

Mike