From 4b6994c2e588c6b096776ac254b5ee74b33753ad Mon Sep 17 00:00:00 2001
From: Aleksander Mistewicz <a.mistewicz@samsung.com>
Date: Tue, 15 Nov 2016 15:33:25 +0100
Subject: [PATCH] Overall adjustments

Change-Id: I15b9f8b2b8044528a90ce1366fc4b314ed368622
---
 tct/prepare/prepare.sh                | 2 +-
 tsp/jobs/trigger_downloads.sh         | 4 ++--
 tsp/scripts/common_prep_flash_conf.sh | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tct/prepare/prepare.sh b/tct/prepare/prepare.sh
index 24a8d8d..b028859 100755
--- a/tct/prepare/prepare.sh
+++ b/tct/prepare/prepare.sh
@@ -89,5 +89,5 @@ unmount_image() {
     MOUNTPOINT="$1"
     test -n "${MOUNTPOINT}" || die "Missing argument: mountpoint"
 
-    sudo umount "${MOUNTPOINT}"
+    sudo umount -d "${MOUNTPOINT}"
 }
diff --git a/tsp/jobs/trigger_downloads.sh b/tsp/jobs/trigger_downloads.sh
index 1684492..017a2f9 100755
--- a/tsp/jobs/trigger_downloads.sh
+++ b/tsp/jobs/trigger_downloads.sh
@@ -37,7 +37,7 @@ TREE="${TSP_DIR}/tree"
 test -f "${TREE}" || TREE="${TSP_DIR}/tree.example"
 
 # Crawl given url
-timeout 240 "${TSP_DIR}/scripts/crawler.py" --timestamp "${TIMESTAMP}" --tree "${TREE}" --log DEBUG "${URL}" || die "Crawl failed" "$?"
+timeout 600 "${TSP_DIR}/scripts/crawler.py" --timestamp "${TIMESTAMP}" --tree "${TREE}" --log DEBUG "${URL}" || die "Crawl failed" "$?"
 
 # Read next buid_nr
 touch next_dwn
@@ -77,7 +77,7 @@ do
             ln -Tsf "${WS_DOWNLOAD}/${dwn_next}" "${SNAPSHOT_WS_DOWNLOAD_NEW}-$(url2profile "${url}")"
             ;;
     esac
-    for target in "minnow32" "minnow64" "odroid" "mbr64" "headless-artik5" "headless-artik10" "artik5" "artik10"
+    for target in "artik10" "headless-artik5" "mbr64" "minnow64" "minnow32" "odroid"
     do
         next=$((next+1))
         # prepare download directory
diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh
index c260813..066139b 100755
--- a/tsp/scripts/common_prep_flash_conf.sh
+++ b/tsp/scripts/common_prep_flash_conf.sh
@@ -64,6 +64,8 @@ if [ -z "${SDMUX}" ]; then
     exit 1
 fi
 
+echo "sdmux allocated: ${SDMUX}"
+
 case "$TARGET" in
     *odroid*)
         "${TESTLAB_MAJOR}/tct/odroid_prepare_flash_conf.sh" "$SDMUX" "$USR_IMG" "$BOOT_IMG"
-- 
2.7.4