tcwg-benchmark.sh: Update handling of hw_tag in results_id

... to support tcwg-sq-01 and -02 boards.

Change-Id: Ifa7b49ad8da5fb537de4be312b08a276ae0861ad

1 files changed, 18 insertions, 8 deletions

diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh
index d3221d4f..28db9425 100755
--- a/tcwg-benchmark.sh
+++ b/tcwg-benchmark.sh
@@ -211,24 +211,34 @@ esac
 
 # Slaves for this job are virtual slaves on dev-01,
 # convert the slave name into the target board name
-boardname=$(echo "${NODE_NAME}" | sed 's/-bmk//').tcwglab
+boardname=$(echo "${NODE_NAME}" | sed -e 's/-bmk//' -e 's/.tcwglab//').tcwglab
 
-results_id=$(echo "$results_id" \
-		 | sed -e "s/<build_num>/$BUILD_NUMBER/g" \
-		       -e "s/@build_num@/$BUILD_NUMBER/g")
-hw_tag="${results_id%%/*}"
 if echo "$results_id" | grep -q "\.\."; then
     echo "ERROR: results_id should not escape /home/tcwg-benchmark/results* hierarchy; do not use \"..\""
     exit 1
 fi
-case "$hw_tag" in
-    tk1_*|tx1_*) ;;
+
+hw_tag="${results_id%%/*}"
+case "$hw_tag:$boardname:$image_arch" in
+    "@hw_tag@:tcwg-tk1-"*:"armhf") hw_tag="tk1_32" ;;
+    "@hw_tag@:tcwg-tx1-"*:"arm64") hw_tag="tx1_64" ;;
+    "@hw_tag@:tcwg-tx1-"*:"armhf") hw_tag="tx1_32" ;;
+    "@hw_tag@:tcwg-sq-"*:"arm64") hw_tag="sq_64" ;;
+    "@hw_tag@:tcwg-sq-"*:"armhf") hw_tag="sq_32" ;;
+    "tk1_32:tcwg-tk1-"*:"armhf") ;;
+    "tx1_64:tcwg-tx1-"*:"arm64") ;;
+    "tx1_32:tcwg-tx1-"*:"armhf") ;;
     *)
-	echo "ERROR: results_id does not start with a valid hw_tag"
+	echo "ERROR: results_id does not start with a valid hw_tag: $hw_tag"
 	exit 1
 	;;
 esac
 
+results_id=$(echo "$results_id" \
+		 | sed -e "s/<build_num>/$BUILD_NUMBER/g" \
+		       -e "s/@build_num@/$BUILD_NUMBER/g" \
+		       -e "s/@hw_tag@/$hw_tag/g")
+
 # Check that we can ssh to the board and rsync scripts.  This ensures that
 # the board is online and filesystem is good condition.  Try to reboot and/or
 # power-cycle the board as needed.