From aa2fb5acde380188b063131c5c3c48e637ca6b9f Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 4 Oct 2017 10:57:52 -0400 Subject: Fixing test results. Change-Id: I13ea847491f2758fd2003c0b206ec7a1356f3fb2 JIRA: STORPERF-216 Signed-off-by: mbeierl --- ci/daily.sh | 2 ++ docker/storperf-master/storperf/db/test_results_db.py | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ci/daily.sh b/ci/daily.sh index 0170b41..3278e4a 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -83,6 +83,8 @@ echo "========================================================================== echo "Starting run of ${WORKLOAD} ${BLOCK_SIZE} ${QUEUE_DEPTH}" echo "==========================================================================" +exit 0 + JOB=$("${WORKSPACE}/ci/start_job.sh" \ | awk '/job_id/ {print $2}' | sed 's/"//g') curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ diff --git a/docker/storperf-master/storperf/db/test_results_db.py b/docker/storperf-master/storperf/db/test_results_db.py index 8e9c5ef..3ee09d2 100644 --- a/docker/storperf-master/storperf/db/test_results_db.py +++ b/docker/storperf-master/storperf/db/test_results_db.py @@ -17,17 +17,12 @@ def push_results_to_db(db_url, details, logger): """ url = db_url + "/results" - params = details["report"] - - if logger: - logger.info("popped params= %s" % params) - headers = {'Content-Type': 'application/json'} try: if logger: - jsonified_params = json.dumps(params) + jsonified_params = json.dumps(details) logger.info("Pushing results to %s" % (url)) - logger.debug("Parameters: %s" % jsonified_params[:1024]) + logger.debug("Parameters: %s" % details) r = requests.post(url, data=jsonified_params, headers=headers) if logger: logger.debug(r) @@ -37,5 +32,5 @@ def push_results_to_db(db_url, details, logger): except Exception: if logger: logger.exception("Error [push_results_to_db('%s', '%s')]:" % - (db_url, params)) + (db_url, details)) return None -- cgit 1.2.3-korg