store aggregated results in separate folder

Signed-off-by: Michael Oviedo <[email protected]>

osbenchmark/aggregator.py

@@ -241,7 +241,7 @@ def aggregate(self) -> None:
 
             aggregated_results = self.build_aggregated_results()
             file_test_exe_store = FileTestExecutionStore(self.config)
-            file_test_exe_store.store_test_execution(aggregated_results)
+            file_test_exe_store.store_aggregated_execution(aggregated_results)
         else:
             raise ValueError("Incompatible test execution results")
 

osbenchmark/metrics.py

@@ -1550,6 +1550,14 @@ def store_test_execution(self, test_execution):
         with open(self._test_execution_file(), mode="wt", encoding="utf-8") as f:
             f.write(json.dumps(doc, indent=True, ensure_ascii=False))
 
+    def store_aggregated_execution(self, test_execution):
+        doc = test_execution.as_dict()
+        aggregated_execution_path = paths.aggregated_results_root(self.cfg, test_execution_id=test_execution.test_execution_id)
+        io.ensure_dir(aggregated_execution_path)
+        aggregated_file = os.path.join(aggregated_execution_path, "test_execution.json")
+        with open(aggregated_file, mode="wt", encoding="utf-8") as f:
+            f.write(json.dumps(doc, indent=True, ensure_ascii=False))
+
     def _test_execution_file(self, test_execution_id=None):
         return os.path.join(paths.test_execution_root(cfg=self.cfg, test_execution_id=test_execution_id), "test_execution.json")
 

osbenchmark/paths.py

@@ -42,6 +42,10 @@ def test_execution_root(cfg, test_execution_id=None):
         test_execution_id = cfg.opts("system", "test_execution.id")
     return os.path.join(test_excecutions_root(cfg), test_execution_id)
 
+def aggregated_results_root(cfg, test_execution_id=None):
+    if not test_execution_id:
+        test_execution_id = cfg.opts("system", "test_execution.id")
+    return os.path.join(cfg.opts("node", "root.dir"), "aggregated_results", test_execution_id)
 
 def install_root(cfg=None):
     install_id = cfg.opts("system", "install.id")