Change target naming convention, remove symlinks

Move information from filename (argument $0) to a line parameter.
With introduction of testing path of 64-bit images for Minnowboards it
was easier to use single name for all operations (downloading, testing).

Currently supported target configurations:
 * odroid: arm-wayland (common-boot-armv7l-odroidu3,
   common-wayland-3parts-armv7l-odroidu3)
 * minnow32: ia32-wayland (common-wayland-efi-i586)
 * minnow64: x86_64-wayland (common-wayland-efi-x86_64)

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

11 files changed, 53 insertions, 31 deletions

diff --git a/tsp/jobs/common_prep_flash_conf.sh b/tsp/jobs/common_prep_flash_conf.sh
index b19f653..52ad031 100755
--- a/tsp/jobs/common_prep_flash_conf.sh
+++ b/tsp/jobs/common_prep_flash_conf.sh
@@ -25,20 +25,23 @@ test -n "$1" || die "Missing argument: build nr"
 WORKDIR="${WS_TEST}/$1"
 WORKDIR_REMOTE="${WS_TEST_REMOTE}/$1"
 DWN_WORKDIR="${WS_DOWNLOAD}/$1"
-case "$0" in
+
+TARGET="$2"
+
+test -n "$TARGET" || die "Missing argument: target"
+
+case "$TARGET" in
     *odroid*)
         BOOT_IMG="`ls ${DWN_WORKDIR}/tizen-common_*-boot-*.tar.gz`"
         USERSPACE_IMG="`ls ${DWN_WORKDIR}/tizen-common_*-wayland-*.tar.gz`"
-        TARGET="odroid"
         ;;
     *minnow*)
         USERSPACE_IMG="`ls ${DWN_WORKDIR}/tizen-common_*-wayland-*-sda.raw.bz2`"
         USERSPACE_IMG_BMAP="`ls ${DWN_WORKDIR}/tizen-common_*-wayland-*-sda.bmap`"
-        TARGET="minnow"
         ;;
 esac
 
-FAIL_CNT="$2"
+FAIL_CNT="$3"
 test -n "${FAIL_CNT}" || FAIL_CNT=0
 
 if [ "$FAIL_CNT" -ge 2 ]; then
@@ -55,7 +58,7 @@ scp "${BOOT_IMG}" "${USERSPACE_IMG}" "${USERSPACE_IMG_BMAP}" tl-runner:"${WORKDI
 
 echo "start remote script"
 ssh tl-runner "TARGET=${TARGET} FAIL_CNT=${FAIL_CNT} WORKDIR_REMOTE=${WORKDIR_REMOTE} sh -s --" \
-    < "${TSP_DIR}/scripts/${TARGET}_prep_flash_conf.sh"
+    < "${TSP_DIR}/scripts/common_prep_flash_conf.sh"
 echo "finish remote script"
 
 # Copy the results
@@ -70,7 +73,7 @@ if grep -q "Testing failed." sysctl.result
 then
     echo "Retrigger..."
     tsrun_target ${TARGET} -L "RETRIGGERED_$(echo "$TARGET" | tr 'a-z' 'A-Z')_PREPARE_FLASH_CONF" \
-        sh "${TSP_DIR}/jobs/${TARGET}_prep_flash_conf.sh" $1 $(($FAIL_CNT + 1))
+        sh "${TSP_DIR}/jobs/common_prep_flash_conf.sh" "$1" "${TARGET}" "$(($FAIL_CNT + 1))"
     exit 0
 fi
 
diff --git a/tsp/jobs/img_test_common.sh b/tsp/jobs/img_test_common.sh
index 9777b11..41331f1 100755
--- a/tsp/jobs/img_test_common.sh
+++ b/tsp/jobs/img_test_common.sh
@@ -26,21 +26,26 @@ WORKDIR="${WS_TEST}/$1"
 WORKDIR_REMOTE="${WS_TEST_REMOTE}/$1"
 DWN_WORKDIR="${WS_DOWNLOAD}/$1"
 
-case "$0" in
-    *odroid*)
-        TARGET="odroid"
-        ;;
+TARGET="$2"
+
+test -n "$TARGET" || die "Missing argument: target"
+
+
+case "$TARGET" in
     *minnow*)
-        TARGET="minnow"
+        PROJECT_FILE="${DWN_WORKDIR}/project-minnow.conf"
+        DIFF_FILE="${DWN_WORKDIR}/diff-minnow.report"
+        ;;
+    *)
+        PROJECT_FILE="${DWN_WORKDIR}/project-${TARGET}.conf"
+        DIFF_FILE="${DWN_WORKDIR}/diff-${TARGET}.report"
         ;;
 esac
-PROJECT_FILE="${DWN_WORKDIR}/project-${TARGET}.conf"
-DIFF_FILE="${DWN_WORKDIR}/diff-${TARGET}.report"
 mkdir -p "${WORKDIR}"
 cd "${WORKDIR}"
 if $(check_diff "${DIFF_FILE}" "$1");
 then
-    echo "Add ${TARGET}_prep_flash_conf job to the queue"
+    echo "Add common_prep_flash_conf job to the $TARGET queue"
     tsrun_target $TARGET -L "$(echo "$TARGET" | tr 'a-z' 'A-Z')_PREPARE_FLASH_CONF" \
-        sh "${TSP_DIR}/jobs/${TARGET}_prep_flash_conf.sh" "$1"
+        sh "${TSP_DIR}/jobs/common_prep_flash_conf.sh" "$1" "${TARGET}"
 fi
diff --git a/tsp/jobs/img_test_minnow.sh b/tsp/jobs/img_test_minnow.sh
deleted file mode 120000
index 0ceb2d6..0000000
--- a/tsp/jobs/img_test_minnow.sh
+++ /dev/null
@@ -1 +0,0 @@
-img_test_common.sh
\ No newline at end of file
diff --git a/tsp/jobs/img_test_odroid.sh b/tsp/jobs/img_test_odroid.sh
deleted file mode 120000
index 0ceb2d6..0000000
--- a/tsp/jobs/img_test_odroid.sh
+++ /dev/null
@@ -1 +0,0 @@
-img_test_common.sh
\ No newline at end of file
diff --git a/tsp/jobs/minnow_prep_flash_conf.sh b/tsp/jobs/minnow_prep_flash_conf.sh
deleted file mode 120000
index 6c42dc8..0000000
--- a/tsp/jobs/minnow_prep_flash_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-common_prep_flash_conf.sh
\ No newline at end of file
diff --git a/tsp/jobs/odroid_prep_flash_conf.sh b/tsp/jobs/odroid_prep_flash_conf.sh
deleted file mode 120000
index 6c42dc8..0000000
--- a/tsp/jobs/odroid_prep_flash_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-common_prep_flash_conf.sh
\ No newline at end of file
diff --git a/tsp/jobs/trigger_downloads.sh b/tsp/jobs/trigger_downloads.sh
index e42e4a1..2f9636f 100755
--- a/tsp/jobs/trigger_downloads.sh
+++ b/tsp/jobs/trigger_downloads.sh
@@ -35,14 +35,14 @@ do
     fi
     # kill currently running jobs for this url
     for i in $(tsmaster | awk -v URL="$url" '$2 ~ "running" && $0 ~ URL {print $1}'); do kill `tsmaster -p $i`; done
-    for target in "minnow" "odroid"
+    for target in "minnow32" "minnow64" "odroid"
     do
         mkdir -p "${WS_DOWNLOAD}/$i"
         cd "${WS_DOWNLOAD}/$i"
         # Download image for $target
         nr=$(tsmaster -L "DOWNLOAD_IMAGE_${target}" python "${TSP_DIR}/scripts/download_image.py" --log=INFO "--${target}" "$url")
-        nr=$(tsmaster -D "$nr" -L "IMAGE_TEST_${target}" \
-            sh ${TSP_DIR}/jobs/img_test_${target}.sh "$i")
+        nr=$(tsmaster -D "$nr" -L "IMAGE_TEST" \
+            sh ${TSP_DIR}/jobs/img_test_common.sh "$i" "$target")
         i=$((i+1))
     done
 done
diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh
index 1e168df..c904ace 100755
--- a/tsp/scripts/common_prep_flash_conf.sh
+++ b/tsp/scripts/common_prep_flash_conf.sh
@@ -18,20 +18,18 @@
 #
 # Author: Aleksander Mistewicz <a.mistewicz@samsung.com>
 
-# WORKDIR_REMOTE and FAIL_CNT are given as environment variables
+# WORKDIR_REMOTE, TARGET and FAIL_CNT are given as environment variables
 
 TESTLAB_MAJOR="/opt/testlab-major"
 
 cd "${WORKDIR_REMOTE}"
-case "$0" in
+case "$TARGET" in
     *odroid*)
         BOOT_IMG="`pwd`/`ls tizen-common_*-boot-*.tar.gz`"
         USR_IMG="`pwd`/`ls tizen-common_*-wayland-*.tar.gz`"
-        TARGET="odroid"
         ;;
     *minnow*)
         USR_IMG="`pwd`/`ls tizen-common_*_common-*-sda.raw.bz2`"
-        TARGET="minnow"
         ;;
 esac
 
@@ -57,7 +55,14 @@ fi
 UUID_FILE="/var/tmp/uuid-${SDMUX}"
 lockfile-create --use-pid --retry 12 "${UUID_FILE}"
 
-${TESTLAB_MAJOR}/tct/${TARGET}_prepare_flash_conf.sh "$SDMUX" "$USR_IMG" "$BOOT_IMG"
+case "$TARGET" in
+    *odroid*)
+        ${TESTLAB_MAJOR}/tct/odroid_prepare_flash_conf.sh "$SDMUX" "$USR_IMG" "$BOOT_IMG"
+        ;;
+    *minnow*)
+        ${TESTLAB_MAJOR}/tct/minnow_prepare_flash_conf.sh "$SDMUX" "$USR_IMG"
+        ;;
+esac
 
 lockfile-remove "${UUID_FILE}"
 
diff --git a/tsp/scripts/download_image.py b/tsp/scripts/download_image.py
index e68ebf1..f3d7a6a 100755
--- a/tsp/scripts/download_image.py
+++ b/tsp/scripts/download_image.py
@@ -27,7 +27,7 @@ import urllib2
 import argparse
 import logging
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __license__ = "APACHE-2.0"
 __author__ = "Aleksander Mistewicz"
 __author_email__ = "a.mistewicz@samsung.com"
@@ -245,6 +245,14 @@ def parse_arguments():
             action="store_true", default=False, dest="minnow",
             help="Download images for minnowboard")
 
+    parser.add_argument("--minnow32",
+            action="store_true", default=False, dest="minnow32",
+            help="Download images for minnowboard i586")
+
+    parser.add_argument("--minnow64",
+            action="store_true", default=False, dest="minnow64",
+            help="Download images for minnowboard x86_64")
+
     parser.add_argument("-o", "--odroid",
             action="store_true", default=False, dest="odroid",
             help="Download images for odroid")
@@ -269,7 +277,14 @@ def main():
             raise ValueError('Invalid log level: %s' % args.loglevel)
         logging.basicConfig(format='%(asctime)s %(message)s',level=numeric_level)
     logging.debug("Begin")
-    downloader = ImageDownloader(args.url, args.arch)
+    if args.minnow64:
+        downloader = ImageDownloader(args.url, 'x86_64')
+        args.minnow = True
+    elif args.minnow32:
+        downloader = ImageDownloader(args.url, 'i586')
+        args.minnow = True
+    else:
+        downloader = ImageDownloader(args.url, args.arch)
     if args.odroid:
         downloader.odroid()
     if args.minnow:
diff --git a/tsp/scripts/minnow_prep_flash_conf.sh b/tsp/scripts/minnow_prep_flash_conf.sh
deleted file mode 120000
index 6c42dc8..0000000
--- a/tsp/scripts/minnow_prep_flash_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-common_prep_flash_conf.sh
\ No newline at end of file
diff --git a/tsp/scripts/odroid_prep_flash_conf.sh b/tsp/scripts/odroid_prep_flash_conf.sh
deleted file mode 120000
index 6c42dc8..0000000
--- a/tsp/scripts/odroid_prep_flash_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-common_prep_flash_conf.sh
\ No newline at end of file