ci: prepare_artifacts: Fix DTBs upload

Update timestamp format to match the previous format. Fix pattern
matching to upload DTBs to the correct location.

Signed-off-by: bia1708 <[email protected]>

Author: bia1708

ci/travis/prepare_artifacts.sh

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #!/bin/bash -e
 
-TIMESTAMP=$(date +%Y_%m_%d-%H_%M)
+TIMESTAMP=$(date +%Y_%m_%d-%H_%M_%S)
 # For PRs, Azure makes a merge commit (HEAD) because of the shallow copy option
 # (which we want). So, GIT_SHA in this case is the actual correct commit inside
 # the PR, and MERGE_COMMIT is the commit made by Azure (which we extract the date
@@ -88,17 +88,17 @@ artifacts_structure() {
                 echo "IMAGE: ${image_to_copy[${platform}]}!"
                 cp ${image_to_copy[${platform}]} ${image_location}
             fi
-        done
 
-        if [ "${arch}" == "microblaze" ]; then
-            dtbs_to_copy=$(ls -d -1 Microblaze/*)
-        else
-            dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}")
-        fi
+            if [ "${arch}" == "microblaze" ]; then
+                dtbs_to_copy=$(ls -d -1 Microblaze/*)
+            else
+                dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}[-|_]")
+            fi
 
-        # Copy DTBs to the correct location
-        for dtb in ${dtbs_to_copy}; do
-            cp ${dtb} "${TIMESTAMP}/${arch}"
+            # Copy DTBs to the correct location
+            for dtb in ${dtbs_to_copy}; do
+                cp ${dtb} "${TIMESTAMP}/${arch}"
+            done
         done
     done
 }