Add QA config flag for all performance tests

Add a config flag similar to "os", "env" or "rapi" which disables all
performance related tests centrally. The individual config flags for
jobqueue and parallel processing focused tests are not touched.

Also, add the flags to qa-sample.json.

This fixes issue 826.

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 111a337..867989b 100755 (executable)
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -786,6 +786,10 @@ def RunMonitoringTests():
 
 
 def RunPerformanceTests():
+  if not qa_config.TestEnabled("performance"):
+    ReportTestSkip("performance related tests", "performance")
+    return
+
   if qa_config.TestEnabled("jobqueue-performance"):
     RunTest(qa_performance.TestParallelMaxInstanceCreationPerformance)
     RunTest(qa_performance.TestParallelNodeCountInstanceCreationPerformance)

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 365f876..99fd9a9 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -149,6 +149,7 @@
     "os": true,
     "tags": true,
     "rapi": true,
+    "performance": true,
     "test-jobqueue": true,
     "delay": true,
 
@@ -223,6 +224,9 @@
 
     "job-list": true,
 
+    "jobqueue-performance": true,
+    "parallel-performance": true,
+
     "# cron/ganeti-watcher should be disabled for these tests": null,
     "instance-automatic-restart": false,
     "instance-consecutive-failures": false,