Add timeout to remote script run and watcher

Change-Id: I6713f6bbfba3aecf6108e01f21de709f3eadd0be
Signed-off-by: Aleksander Mistewicz <a.mistewicz@samsung.com>

diff --git a/tsp/jobs/common_prep_flash_conf.sh b/tsp/jobs/common_prep_flash_conf.sh
index c2b8f05..75cb5b1 100755 (executable)
--- a/tsp/jobs/common_prep_flash_conf.sh
+++ b/tsp/jobs/common_prep_flash_conf.sh
@@ -57,7 +57,7 @@ ssh tl-runner "rm -rf \"${WORKDIR_REMOTE}\"; mkdir -p \"${WORKDIR_REMOTE}\""
 scp "${BOOT_IMG}" "${USERSPACE_IMG}" "${USERSPACE_IMG_BMAP}" tl-runner:"${WORKDIR_REMOTE}/"
 
 echo "start remote script"
-ssh tl-runner "TARGET=${TARGET} FAIL_CNT=${FAIL_CNT} WORKDIR_REMOTE=${WORKDIR_REMOTE} sh -s --" \
+ssh tl-runner "TARGET=${TARGET} FAIL_CNT=${FAIL_CNT} WORKDIR_REMOTE=${WORKDIR_REMOTE} timeout 10m sh -s --" \
     < "${TSP_DIR}/scripts/common_prep_flash_conf.sh"
 echo "finish remote script"
 

diff --git a/tsp/jobs/watcher.sh b/tsp/jobs/watcher.sh
index 4502c2d..b7160e4 100755 (executable)
--- a/tsp/jobs/watcher.sh
+++ b/tsp/jobs/watcher.sh
@@ -25,9 +25,9 @@ cd "${WS_WATCHER}"
 touch dispatched_urls
 touch timestamp
 touch timestamp_snapshot
-nr=$(tspoll -L PRERELEASE_WATCHER sh -c "ROOT=\"http://download.tizen.org/prerelease/tizen/common/\" \
+nr=$(tspoll -L PRERELEASE_WATCHER timeout 120 sh -c "ROOT=\"http://download.tizen.org/prerelease/tizen/common/\" \
     ${TSP_DIR}/scripts/crawler.py")
 nr=$(tspoll -D $nr -L DOWNLOAD_TRIGGER sh -c "${TSP_DIR}/jobs/trigger_downloads.sh")
-nr=$(tspoll -D $nr -L SNAPSHOT_WATCHER sh -c "ROOT=\"http://download.tizen.org/snapshots/tizen/common/\" \
+nr=$(tspoll -D $nr -L SNAPSHOT_WATCHER timeout 120 sh -c "ROOT=\"http://download.tizen.org/snapshots/tizen/common/\" \
     ${TSP_DIR}/scripts/crawler.py")
 tspoll -D $nr -L DOWNLOAD_TRIGGER sh -c "${TSP_DIR}/jobs/trigger_downloads.sh"