Tagging support

Author: rjtokenring

example/tools/ota/ota_mass_upload.sh

@@ -21,19 +21,20 @@ checkExecutable "paste"
 
 # Default wait time for OTA process to complete
 waittime=600
+newtagversion=""
 
 while getopts t:v:f:o: flag
 do
     case "${flag}" in
         t) tag=${OPTARG};;
-        v) version=${OPTARG};;
+        v) newtagversion=${OPTARG};;
         f) firmwarefile=${OPTARG};;
         o) waittime=${OPTARG};;
     esac
 done
 
 if [[ "$firmwarefile" == "" || "$tag" == "" || "$waittime" == "" ]]; then
-    echo "Usage: $0 -t <tag> -f <firmwarefile> [-o <waittime>] [-v <new firmware version>]"
+    echo "Usage: $0 -t <tag> -f <firmwarefile> [-o <waittime>] [-v <new firmware version for tagging>]"
     exit 1    
 fi
 
@@ -87,6 +88,7 @@ while [ $waittime -gt 0 ]; do
     otastatuslines=$(arduino-cloud-cli ota status --ota-ids $otaids --format json)
     otastatusinpcnt=$(echo $otastatuslines | grep in_progress | wc -l)
     otastatuspencnt=$(echo $otastatuslines | grep pending | wc -l)
+    otasucceeded=$(echo $otastatuslines | jq -r '.[] | select (.status | contains("succeeded")) | .device_id' | uniq | paste -sd "," -)
     if [[ $otastatusinpcnt -eq 0 && $otastatuspencnt -eq 0 ]]; then
         correctlyfinished=1
         break   
@@ -97,11 +99,15 @@ echo ""
 echo "Status report:"
 arduino-cloud-cli ota status --ota-ids $otaids
 
-if [ $correctlyfinished -eq 1 ]; then
+if [ $correctlyfinished -eq 0 ]; then
     echo "OTA process did not complete within the specified time for some boards"
     exit 1
 else 
     echo "OTA process completed successfully for all boards"
+    if [ "$newtagversion" != "" ]; then
+        echo "Tagging updated devices with tag: $newtagversion"
+        arduino-cloud-cli device create-tags --ids $otasucceeded --tags $newtagversion
+    fi
     exit 0
 fi