Allow selection of hypervisor type in QA

This patch allows the selection of the hypervisor type for the QA
process; this is useful when testing hypervisor-independent changes that
don't require a Xen setup.

The patch also fixes the OS name in the sample QA config file provided.

Reviewed-by: imsnah

diff --git a/qa/qa-sample.yaml b/qa/qa-sample.yaml
index 3901d96..a5795d7 100644 (file)
--- a/qa/qa-sample.yaml
+++ b/qa/qa-sample.yaml
@@ -1,8 +1,9 @@
 # Cluster name
 name: xen-test
+hypervisor-type: xen-3.0
 
 # System to use
-os: debian-edgy
+os: debian-etch
 os-size: 10G
 swap-size: 1G
 mem: 512M

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 245ac68..08868fd 100644 (file)
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -66,6 +66,10 @@ def TestClusterInit():
     cmd.append('--bridge=%s' % bridge)
     cmd.append('--master-netdev=%s' % bridge)
 
+  htype = qa_config.get('hypervisor-type', None)
+  if htype:
+    cmd.append('--hypervisor-type=%s' % htype)
+
   cmd.append(qa_config.get('name'))
 
   AssertEqual(StartSSH(master['primary'],