From 58598264ab934c2d86b45a3ddc36060cda991b13 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 5 Jul 2010 15:37:43 +0200
Subject: [PATCH] Add a QA option to disable reboots during burnin
Since we have seen cases where (repeated) reboots are not supported
(e.g. Xen 3.4+), we need to be able to control this in the QA
configuration.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
qa/qa-sample.json | 3 ++-
qa/qa_cluster.py | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index a3c20706a..a737e16a1 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -98,7 +98,8 @@
"burnin-disk-template": "drbd",
"burnin-in-parallel": false,
"burnin-check-instances": false,
- "burnin-rename": "xen-test-rename"
+ "burnin-rename": "xen-test-rename",
+ "burnin-reboot": true
},
"# vim: set syntax=javascript :": null
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 7c0de1976..1a89d5b73 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -251,6 +251,7 @@ def TestClusterBurnin():
parallel = options.get('burnin-in-parallel', False)
check_inst = options.get('burnin-check-instances', False)
do_rename = options.get('burnin-rename', '')
+ do_reboot = options.get('burnin-reboot', True)
# Get as many instances as we need
instances = []
@@ -280,6 +281,8 @@ def TestClusterBurnin():
cmd.append('--http-check')
if do_rename:
cmd.append('--rename=%s' % do_rename)
+ if not do_reboot:
+ cmd.append('--no-reboot')
cmd += [inst['name'] for inst in instances]
AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
--
GitLab