dashboard-generate-squad.sh: Accept Mean values

... also :
- sort environments to have squad environment first
- and few rewriting

Change-Id: Idb5902f9108db918e3bd092fc2fd9afdb6aa789f

1 files changed, 22 insertions, 24 deletions

diff --git a/dashboard-generate-squad.sh b/dashboard-generate-squad.sh
index 254cd610..17be98ba 100755
--- a/dashboard-generate-squad.sh
+++ b/dashboard-generate-squad.sh
@@ -29,6 +29,7 @@ create_dashboard_files()
     local dashboard_dir=${dbd[dashboard_dir]}
     local check_regression_dir=${dbd[check_regression_dir]}
     local bench
+    local envlist=()
 
     declare -A project_results
 
@@ -54,7 +55,9 @@ create_dashboard_files()
 	   "csv-results-1/results:symbol_md5sum")
 
       if [ ! -f "$results_csv" ]; then
+         echo ""
          echo "WARNING: no results-brief.csv file. No data to store in dashboard."
+         echo ""
          return
       fi
 
@@ -74,7 +77,7 @@ create_dashboard_files()
           fi
           header_verified=true
 	fi
-	[[ $symb == *_base.default* ]] || continue
+	[[ $bench == 001.Mean ]] || [[ $symb == *_base.default* ]] || continue
 
 	if [ -v project_results["func/build/$bench"] ] && [ ${project_results["func/build/$bench"]} != "pass" ]; then
            : # do nothing if fail is already
@@ -83,26 +86,28 @@ create_dashboard_files()
               999999999)
         	 project_results["func/build/$bench"]="fail" ; ((nbfail+=1))
         	 project_results["func/run/$bench"]="skip" ; ((nbskip+=1))
-        	 # project_results["metrics/perf/$bench"]=""
-        	 # project_results["metrics/size/$bench"]=""
-        	 # project_results["metrics/vect/$bench"]=""
+
+		 # If failing to build, all metrics unknown (-1)
+		 vect1=-1 ; size1=-1 ; sample1=-1
 		 ;;
 	      888888888)
         	 project_results["func/build/$bench"]="pass" ; ((nbpass+=1))
         	 project_results["func/run/$bench"]="fail" ; ((nbfail+=1))
         	 [ $vect1 != "-1" ] && project_results["metrics/vect/$bench"]="$vect1"
         	 [ $size1 != "-1" ] && project_results["metrics/size/$bench"]="$size1"
-        	 # project_results["metrics/perf/$bench"]=""
 
+                 # If failing to run, run metrics unknwon (-1)
+                 sample1=-1
 		 ;;
 	      *)
         	 project_results["func/build/$bench"]="pass" ; ((nbpass+=1));
         	 project_results["func/run/$bench"]="pass" ; ((nbpass+=1));
-        	 [ $vect1 != "-1" ] && project_results["metrics/vect/$bench"]="$vect1"
-        	 [ $size1 != "-1" ] && project_results["metrics/size/$bench"]="$size1"
-        	 [ $sample1 != "-1" ] && project_results["metrics/perf/$bench"]="$sample1"
 		 ;;
            esac
+           [ $vect1 != "-1" ] && project_results["metrics/vect/$bench"]="$vect1"
+           [ $size1 != "-1" ] && project_results["metrics/size/$bench"]="$size1"
+           [ $sample1 != "-1" ] && project_results["metrics/perf/$bench"]="$sample1"
+	   envlist+=("$bench")
            ((nbtest+=2))
 	fi
 
@@ -130,8 +135,13 @@ create_dashboard_files()
       project_results["func/build/test"]="pass"
       project_results["func/run/test"]="pass"
       project_results["metrics/score/test"]="${dbd['score']}"
+
+      envlist=("score")
     fi
 
+    # get benchs sorted to have 001.Mean first
+    mapfile -t envlist < <(printf "%s\n" "${envlist[@]}" | sort -n)
+
     # -----------------------------
     # Write json files
     # for each bench :
@@ -144,12 +154,7 @@ create_dashboard_files()
 
     # Generate 3 results files : functional, metrics, metadata
     #
-    for key in "${!project_results[@]}"; do
-
-      kind=$(echo $key | cut -d/ -f1)
-      #field=$(echo $key | cut -d/ -f2)
-      bench=$(echo $key | cut -d/ -f3)
-      [[ "$kind" == "func" ]] || continue
+    for bench in "${envlist[@]}"; do
 
       # echo " - writing $squaddir/$bench	# ${project_results["func/*/$bench"]}"
       mkdir -p $squaddir/$bench
@@ -235,7 +240,7 @@ EOF
 
     echo "  - generating cmd to push results"
 
-    local squad_server prj grp bld env squad_url
+    local squad_server prj grp bld squad_url
     local results_results results_metrics results_metadata
 
     squad_server=https://qa-reports.linaro.org/
@@ -275,16 +280,9 @@ EOF
       echo "echo \"WARNING : Nowhere to push results $var='${FORCE_SQUAD_GRP-$SQUAD_GRP}'\"" >> $pushcmdfile
       echo "WARNING : Nowhere to push results $var='${FORCE_SQUAD_GRP-$SQUAD_GRP}'"
     else
-      for key in "${!project_results[@]}"; do
-
-	kind=$(echo $key | cut -d/ -f1)
-	#field=$(echo $key | cut -d/ -f2)
-	bench=$(echo $key | cut -d/ -f3)
-	[[ "$kind" == "func" ]] || continue
-
-	env="$bench"
+      for bench in "${envlist[@]}"; do
 
-	squad_url=$squad_server/api/submit/$grp/$prj/$bld/$env
+	squad_url=$squad_server/api/submit/$grp/$prj/$bld/$bench
 
 	# result files
 	results_results="$bench/results-functional.json"