The “RunTestIf” uses an AND association between the passed test names,
so the instance would be be shut down if both rename and reinstall were
enabled. Since this is not necessarily the case, OR must be used.
---
qa/ganeti-qa.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 9f12d37..ec96420 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -252,7 +252,12 @@ def RunCommonInstanceTests(instance):
RunTestIf(["instance-console", "rapi"],
qa_rapi.TestRapiInstanceConsole, instance)
- DOWN_TESTS = ["instance-reinstall", "instance-rename", "instance-grow-disk"]
+ DOWN_TESTS = qa_config.Either([
+ "instance-reinstall",
+ "instance-rename",
+ "instance-grow-disk",
+ ])
+
# shutdown instance for any 'down' tests
RunTestIf(DOWN_TESTS, qa_instance.TestInstanceShutdown, instance)
--
1.7.6
