From 04b5f2223f37b40d4a65dd12aacdbe7295eb0e97 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 27 Feb 2013 15:46:43 +0100
Subject: [PATCH] QA: Disable drbd-offline test if no DRBD instance is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If βinstance-add-drbd-diskβ is not enabled it usually also means to not
use DRBD at all.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>
---
qa/ganeti-qa.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 1a93e9790..b4b088b71 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -650,7 +650,8 @@ def RunQa():
RunExclusiveStorageTests()
# Test removing instance with offline drbd secondary
- if qa_config.TestEnabled("instance-remove-drbd-offline"):
+ if qa_config.TestEnabled(["instance-remove-drbd-offline",
+ "instance-add-drbd-disk"]):
# Make sure the master is not put offline
snode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode())
try:
--
GitLab