summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/daily.sh4
-rw-r--r--docker/storperf-master/storperf/test_executor.py7
2 files changed, 8 insertions, 3 deletions
diff --git a/ci/daily.sh b/ci/daily.sh
index 0957e09..f87690f 100755
--- a/ci/daily.sh
+++ b/ci/daily.sh
@@ -90,14 +90,14 @@ JOB=$("${WORKSPACE}/ci/start_job.sh" \
curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \
-o "${WORKSPACE}/ci/job/status.json"
-JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2)
+JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2)
while [ "${JOB_STATUS}" != "Completed" ]
do
sleep 600
mv "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json"
curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \
-o "${WORKSPACE}/ci/job/status.json"
- JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2)
+ JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2)
if diff "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json" >/dev/null
then
cat "${WORKSPACE}/ci/job/status.json"
diff --git a/docker/storperf-master/storperf/test_executor.py b/docker/storperf-master/storperf/test_executor.py
index 629ae15..96c2ee4 100644
--- a/docker/storperf-master/storperf/test_executor.py
+++ b/docker/storperf-master/storperf/test_executor.py
@@ -230,7 +230,12 @@ class TestExecutor(object):
for job in jobs:
if self.job_db.job_id == job_id and self._terminated is False:
status = "Running"
- result[job] = status
+ result['Status'] = status
+ result['Workloads'] = self.workload_status
+ result['TestResultURL'] = self.result_url
+ else:
+ result[job] = {}
+ result[job]['Status'] = "Completed"
return result