From 0b0a150ab5385a7b76ebcb3dd68cf3989e5b81ca Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 13 Jan 2009 13:25:48 +0000
Subject: [PATCH] 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
---
qa/qa-sample.json | 4 +++-
qa/qa_cluster.py | 11 +++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index f4e84d5d9..7c5027f11 100644
--- 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 46f07bfce..d2367c016 100644
--- 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)
--
GitLab