From e3f9ae2bc20514c17fef484f7134b25527a4c813 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 26 Jul 2011 19:11:28 +0200
Subject: [PATCH] QA: test using OS API v20
v20 is (mostly) a superset of the other versions, so testing with it
should be better than with V10. This detects properly the breakage
fixed by the previous patch.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
qa/qa_os.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/qa/qa_os.py b/qa/qa_os.py
index 5868a392e..6910083c1 100644
--- a/qa/qa_os.py
+++ b/qa/qa_os.py
@@ -86,19 +86,25 @@ def _SetupTempOs(node, dirname, valid):
"""
sq = utils.ShellQuoteArgs
- parts = [sq(["rm", "-rf", dirname]),
- sq(["mkdir", "-p", dirname]),
- sq(["cd", dirname]),
- sq(["ln", "-fs", "/bin/true", "export"]),
- sq(["ln", "-fs", "/bin/true", "import"]),
- sq(["ln", "-fs", "/bin/true", "rename"])]
+ parts = [
+ sq(["rm", "-rf", dirname]),
+ sq(["mkdir", "-p", dirname]),
+ sq(["cd", dirname]),
+ sq(["ln", "-fs", "/bin/true", "export"]),
+ sq(["ln", "-fs", "/bin/true", "import"]),
+ sq(["ln", "-fs", "/bin/true", "rename"]),
+ sq(["ln", "-fs", "/bin/true", "verify"]),
+ ]
if valid:
parts.append(sq(["ln", "-fs", "/bin/true", "create"]))
- parts.append(sq(["echo", str(constants.OS_API_V10)]) +
+ parts.append(sq(["echo", str(constants.OS_API_V20)]) +
" >ganeti_api_version")
+ parts.append(sq(["echo", "default"]) + " >variants.list")
+ parts.append(sq(["echo", "funny this is funny"]) + " >parameters.list")
+
cmd = " && ".join(parts)
print qa_utils.FormatInfo("Setting up %s with %s OS definition" %
--
GitLab