Fix multiple workload runs

Change reporting so that multiple workloads in one job execution can
be reported instead of overwriting the previous value.

Change the daily job to use a single, multiple workload run.

Change-Id: I8e350350ae13d2272b584af7a60ad269de160587
JIRA: STORPERF-98
Signed-off-by: mbeierl <mark.beierl@dell.com>

1 files changed, 13 insertions, 23 deletions

diff --git a/ci/daily.sh b/ci/daily.sh
index e3b64cc..1e77d67 100755
--- a/ci/daily.sh
+++ b/ci/daily.sh
@@ -96,32 +96,22 @@ do
     | awk '/Status/ {print $2}' | sed 's/"//g'`
 done
 
-for WORKLOAD in ws wr rs rr rw
+export QUEUE_DEPTH=1,2,8
+export BLOCK_SIZE=2048,8192,16384
+export WORKLOAD=ws,wr,rs,rr,rw
+export SCENARIO_NAME="${CINDER_BACKEND}_${WORKLOAD}"
+
+JOB=`$WORKSPACE/ci/start_job.sh \
+    | awk '/job_id/ {print $2}' | sed 's/"//g'`
+JOB_STATUS=`curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=$JOB&type=status" \
+    | awk '/Status/ {print $2}' | sed 's/"//g'`
+while [ "$JOB_STATUS" != "Completed" ]
 do
-    for BLOCK_SIZE in 2048 8192 16384
-    do
-        for QUEUE_DEPTH in 1 2 8
-        do
-            export QUEUE_DEPTH
-            export BLOCK_SIZE
-            export WORKLOAD
-            export SCENARIO_NAME="${CINDER_BACKEND}_${WORKLOAD}"
-
-            JOB=`$WORKSPACE/ci/start_job.sh \
-                | awk '/job_id/ {print $2}' | sed 's/"//g'`
-            JOB_STATUS=`curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=$JOB&type=status" \
-                | awk '/Status/ {print $2}' | sed 's/"//g'`
-            while [ "$JOB_STATUS" != "Completed" ]
-            do
-                sleep 60
-                JOB_STATUS=`curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=$JOB&type=status" \
-                    | awk '/Status/ {print $2}' | sed 's/"//g'`
-            done
-        done
-    done
+    sleep 60
+    JOB_STATUS=`curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=$JOB&type=status" \
+        | awk '/Status/ {print $2}' | sed 's/"//g'`
 done
 
-
 echo "Deleting stack for cleanup"
 curl -X DELETE --header 'Accept: application/json' 'http://127.0.0.1:5000/api/v1.0/configurations'