Skip to content
Snippets Groups Projects
Commit 0b0a150a authored by Iustin Pop's avatar Iustin Pop
Browse files

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
parent 24b0d752
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,9 @@ ...@@ -87,7 +87,9 @@
"options": { "options": {
"burnin-instances": 2, "burnin-instances": 2,
"burnin-disk-template": "drbd" "burnin-disk-template": "drbd",
"burnin-in-parallel": false,
"burnin-check-instances": false
}, },
"# vim: set syntax=javascript :": null "# vim: set syntax=javascript :": null
......
...@@ -148,8 +148,10 @@ def TestClusterBurnin(): ...@@ -148,8 +148,10 @@ def TestClusterBurnin():
"""Burnin""" """Burnin"""
master = qa_config.GetMasterNode() master = qa_config.GetMasterNode()
disk_template = (qa_config.get('options', {}). options = qa_config.get('options', {})
get('burnin-disk-template', 'drbd')) 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 # Get as many instances as we need
instances = [] instances = []
...@@ -168,10 +170,15 @@ def TestClusterBurnin(): ...@@ -168,10 +170,15 @@ def TestClusterBurnin():
try: try:
# Run burnin # Run burnin
cmd = [script, cmd = [script,
'-p',
'--os=%s' % qa_config.get('os'), '--os=%s' % qa_config.get('os'),
'--disk-size=%s' % ",".join(qa_config.get('disk')), '--disk-size=%s' % ",".join(qa_config.get('disk')),
'--disk-growth=%s' % ",".join(qa_config.get('disk-growth')), '--disk-growth=%s' % ",".join(qa_config.get('disk-growth')),
'--disk-template=%s' % disk_template] '--disk-template=%s' % disk_template]
if parallel:
cmd.append('--parallel')
if check_inst:
cmd.append('--http-check')
cmd += [inst['name'] for inst in instances] cmd += [inst['name'] for inst in instances]
AssertEqual(StartSSH(master['primary'], AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0) utils.ShellQuoteArgs(cmd)).wait(), 0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment