QA: add burnin parameters (parallel, http-check)

This patch adds burnin parameters for --parallel and --http-check
options to the burnin script.

Reviewed-by: ultrotter

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index f4e84d5..7c5027f 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -87,7 +87,9 @@
 
   "options": {
     "burnin-instances": 2,
-    "burnin-disk-template": "drbd"
+    "burnin-disk-template": "drbd",
+    "burnin-in-parallel": false,
+    "burnin-check-instances": false
   },
 
   "# vim: set syntax=javascript :": null

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 46f07bf..d2367c0 100644 (file)
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -148,8 +148,10 @@ def TestClusterBurnin():
   """Burnin"""
   master = qa_config.GetMasterNode()
 
-  disk_template = (qa_config.get('options', {}).
-                   get('burnin-disk-template', 'drbd'))
+  options = qa_config.get('options', {})
+  disk_template = options.get('burnin-disk-template', 'drbd')
+  parallel = options.get('burnin-in-parallel', False)
+  check_inst = options.get('burnin-check-instances', False)
 
   # Get as many instances as we need
   instances = []
@@ -168,10 +170,15 @@ def TestClusterBurnin():
     try:
       # Run burnin
       cmd = [script,
+             '-p',
              '--os=%s' % qa_config.get('os'),
              '--disk-size=%s' % ",".join(qa_config.get('disk')),
              '--disk-growth=%s' % ",".join(qa_config.get('disk-growth')),
              '--disk-template=%s' % disk_template]
+      if parallel:
+        cmd.append('--parallel')
+      if check_inst:
+        cmd.append('--http-check')
       cmd += [inst['name'] for inst in instances]
       AssertEqual(StartSSH(master['primary'],
                            utils.ShellQuoteArgs(cmd)).wait(), 0)