diff options
Diffstat (limited to 'storperf')
-rw-r--r-- | storperf/db/test_results_db.py | 7 | ||||
-rw-r--r-- | storperf/test_executor.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/storperf/db/test_results_db.py b/storperf/db/test_results_db.py index 8636e52..4ee7a52 100644 --- a/storperf/db/test_results_db.py +++ b/storperf/db/test_results_db.py @@ -8,9 +8,10 @@ ############################################################################## import json -import requests import os +import requests + def get_installer_type(logger=None): """ @@ -26,7 +27,8 @@ def get_installer_type(logger=None): return installer -def push_results_to_db(db_url, project, case_name, logger, pod_name, +def push_results_to_db(db_url, project, case_name, + test_start, test_stop, logger, pod_name, version, scenario, criteria, build_tag, payload): """ POST results to the Result target DB @@ -34,6 +36,7 @@ def push_results_to_db(db_url, project, case_name, logger, pod_name, url = db_url + "/results" installer = get_installer_type(logger) params = {"project_name": project, "case_name": case_name, + "start_date": test_start, "stop_date": test_stop, "pod_name": pod_name, "installer": installer, "version": version, "scenario": scenario, "criteria": criteria, "build_tag": build_tag, "details": payload} diff --git a/storperf/test_executor.py b/storperf/test_executor.py index c984175..3c456a6 100644 --- a/storperf/test_executor.py +++ b/storperf/test_executor.py @@ -242,7 +242,6 @@ class TestExecutor(object): self.logger.info("Completed workload %s" % (workload_name)) self.logger.info("Completed job %s" % (self.job_db.job_id)) - self._terminated = True end_time = time.time() pod_name = dictionary.get_key_from_dict(self.metadata, @@ -252,7 +251,7 @@ class TestExecutor(object): 'version', 'Unknown') scenario = dictionary.get_key_from_dict(self.metadata, - 'scenario', + 'scenario_name', 'Unknown') build_tag = dictionary.get_key_from_dict(self.metadata, 'build_tag', @@ -281,6 +280,8 @@ class TestExecutor(object): test_results_db.push_results_to_db(test_db, "storperf", "Latency Test", + start_time, + end_time, self.logger, pod_name, version, @@ -291,6 +292,8 @@ class TestExecutor(object): except: self.logger.exception("Error pushing results into Database") + self._terminated = True + def execute_on_node(self, workload): invoker = FIOInvoker() |