Read disposable performance from JSON

For: QubesOS/qubes-issues#1512

Author: ben-grande

extra-files/system-tests/dom0.sls

@@ -18,6 +18,7 @@ dom0-packages:
       - btrfs-progs
       - python3-nose2
       - python3-objgraph
+      - python3-deepmerge
       - patch
       - qubes-video-companion-dom0
       - split-gpg2-dom0

utils/github_reporting.py

@@ -157,7 +157,18 @@ def format_results(results, jobs, reference_jobs=None, instability_analysis=None
                 # try to find reference value
                 ref = None
                 if job_name in ref_job_perf_data:
-                    ref = ref_job_perf_data[job_name].get(test_name, None)
+                    if 'dispvm_perf' in job_name:
+                        ref_name = test_name.split(' ')[0]
+                        ref_data = [
+                            v
+                            for k, v in ref_job_perf_data[job_name].items()
+                            if k.startswith(ref_name + ' ')
+                        ]
+                        if ref_data:
+                            ref = ref_data[0]
+                    else:
+                        ref_name = test_name
+                        ref = ref_job_perf_data[job_name].get(ref_name, None)
 
                 degradation = False
                 alert = None

utils/lib/openqa_api.py

@@ -341,15 +341,24 @@ def get_performance_data(self):
 
 
         if 'dispvm_perf' in json_data['job']['name']:
-            for line in perf_data.split("\n"):
-                if not line:
-                    continue
-                data = line.split(" ")
-                name = data[0]
-                value = data[1]
-                data_dict = dict(item.split("=", maxsplit=1) for item in data[2:])
-                key = name + "(avg:" + data_dict["average"] + ")"
-                result[key] = float(value)
+            try:
+                data = json.loads(perf_data)
+                for key, value in data.items():
+                    name = value["name"]
+                    mean = value["mean"]
+                    total = value["total"]
+                    key += " (mean:" + str(mean) + ")"
+                    result[key] = float(total)
+            except json.decoder.JSONDecodeError:
+                for line in perf_data.split("\n"):
+                    if not line:
+                        continue
+                    data = line.split(" ")
+                    name = data[0]
+                    total = data[1]
+                    data_dict = dict(v.split("=", maxsplit=1) for v in data[2:])
+                    key = name + " (mean:" + data_dict["average"] + ")"
+                    result[key] = float(total)
             return result
 
         if 'qrexec_perf' in json_data['job']['name']: