diff options
Diffstat (limited to 'tsp')
-rwxr-xr-x | tsp/common.sh | 21 | ||||
-rw-r--r-- | tsp/image_map.example | 2 | ||||
-rwxr-xr-x | tsp/jobs/common_prep_flash_conf.sh | 2 | ||||
-rwxr-xr-x | tsp/jobs/img_test_common.sh | 2 | ||||
-rw-r--r-- | tsp/results-values-device.sql | 4 | ||||
-rwxr-xr-x | tsp/scripts/common_prep_flash_conf.sh | 3 | ||||
-rwxr-xr-x | tsp/scripts/publish.py | 2 | ||||
-rw-r--r-- | tsp/tree_unified | 3 |
8 files changed, 28 insertions, 11 deletions
diff --git a/tsp/common.sh b/tsp/common.sh index ca6bbe4..75c9f9d 100755 --- a/tsp/common.sh +++ b/tsp/common.sh @@ -30,9 +30,9 @@ die() { # Supported targets are: # * artik5, headless-artik5, artik10, headless-artik10 # * minnow32, minnow64 -# * odroid +# * common-odroid, tv-odroid # * mbr64 -TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 odroid" +TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 common-odroid tv-odroid ivi-odroid" test -z "${TSP_DIR}" || export TS_ONFINISH="${TSP_DIR}/scripts/log.sh" @@ -134,8 +134,14 @@ get_userspace_dir() { test -n "$TARGET" || die "Missing argument: target" test -n "$DWN_WORKDIR" || die "Missing argument: dwn_workdir" case "$TARGET" in - *odroid*) - USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland*-armv7l-odroidu3")" + *common-odroid*) + USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "common*-wayland*-armv7l-odroidu3")" + ;; + *ivi-odroid*) + USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "ivi-target-odroidxu3")" + ;; + *tv-odroid*) + USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "tv-wayland*-armv7l-odroidu3")" ;; *headless-artik*) USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-artik")" @@ -169,8 +175,11 @@ get_boot_dir() { test -n "$TARGET" || die "Missing argument: target" test -n "$DWN_WORKDIR" || die "Missing argument: dwn_workdir" case "$TARGET" in - *odroid*) - BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-odroidu3")" + *common-odroid*|*ivi-odroid*) + BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "common*-boot-armv7l-odroidu3")" + ;; + *tv-odroid*) + BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "tv-boot-armv7l-odroidu3")" ;; *artik5*) BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik5")" diff --git a/tsp/image_map.example b/tsp/image_map.example index 1c81982..1fdd498 100644 --- a/tsp/image_map.example +++ b/tsp/image_map.example @@ -1,5 +1,7 @@ boot-armv7l-odroidu3 wayland-3parts-armv7l-odroidu3 +target-odroidxu3 +wayland-armv7l-odroidu3 boot-armv7l-artik5 boot-armv7l-artik10 headless-3parts-armv7l-artik diff --git a/tsp/jobs/common_prep_flash_conf.sh b/tsp/jobs/common_prep_flash_conf.sh index 8a62e95..210e9ce 100755 --- a/tsp/jobs/common_prep_flash_conf.sh +++ b/tsp/jobs/common_prep_flash_conf.sh @@ -77,7 +77,7 @@ retrigger() { exit 1 fi ssh tl-runner "rm -rf \"${WORKDIR_REMOTE}\"; mkdir -p \"${WORKDIR_REMOTE}\"" || retrigger "ssh: remote ws cleanup failed" - tsrun_target "${TARGET#headless-}" -L "RETRIGGERED_$(echo "$TARGET" | tr '[:lower:]' '[:upper:]')_PREPARE_FLASH_CONF" \ + tsrun_target "${TARGET#*-}" -L "RETRIGGERED_$(echo "$TARGET" | tr '[:lower:]' '[:upper:]')_PREPARE_FLASH_CONF" \ sh "${TSP_DIR}/jobs/common_prep_flash_conf.sh" "$BUILD_NR" "${TARGET}" "$((FAIL_CNT + 1))" # Update status in database update_db "${SR}" "In test queue" "$BUILD_NR" "$TARGET" diff --git a/tsp/jobs/img_test_common.sh b/tsp/jobs/img_test_common.sh index 55d01e9..f349fcb 100755 --- a/tsp/jobs/img_test_common.sh +++ b/tsp/jobs/img_test_common.sh @@ -83,7 +83,7 @@ esac if check_diff "${DIFF_FILE1}" "${DIFF_FILE2}" "${BUILD_NR}" "${TARGET}" then echo "Add common_prep_flash_conf job to the $TARGET queue" - tsrun_target "${TARGET#headless-}" -L "$(echo "$TARGET" | tr '[:lower:]' '[:upper:]')_PREPARE_FLASH_CONF" \ + tsrun_target "${TARGET#*-}" -L "$(echo "$TARGET" | tr '[:lower:]' '[:upper:]')_PREPARE_FLASH_CONF" \ sh "${TSP_DIR}/jobs/common_prep_flash_conf.sh" "${BUILD_NR}" "${TARGET}" # Update status in database update_db "$SR" "In test queue" "${BUILD_NR}" "$TARGET" diff --git a/tsp/results-values-device.sql b/tsp/results-values-device.sql index 347251d..948e702 100644 --- a/tsp/results-values-device.sql +++ b/tsp/results-values-device.sql @@ -1,4 +1,6 @@ -INSERT OR IGNORE INTO device VALUES (NULL, "odroid"); +INSERT OR IGNORE INTO device VALUES (NULL, "common-odroid"); +INSERT OR IGNORE INTO device VALUES (NULL, "tv-odroid"); +INSERT OR IGNORE INTO device VALUES (NULL, "ivi-odroid"); INSERT OR IGNORE INTO device VALUES (NULL, "minnow32"); INSERT OR IGNORE INTO device VALUES (NULL, "minnow64"); INSERT OR IGNORE INTO device VALUES (NULL, "mbr64"); diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh index 880922d..195e6bf 100755 --- a/tsp/scripts/common_prep_flash_conf.sh +++ b/tsp/scripts/common_prep_flash_conf.sh @@ -24,11 +24,12 @@ FAILED_DEVICE_LOG="/var/tmp/failed_devices.log" TESTLAB_MAJOR="/opt/testlab-major" cd "${WORKDIR_REMOTE}" || exit -ACTUAL_TARGET="${TARGET#headless-}" +ACTUAL_TARGET="${TARGET#*-}" case "$TARGET" in *odroid*) BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*odroid*.tar.gz)" USR_IMG="$(pwd)/$(ls tizen-*-wayland-*odroid*.tar.gz)" + test -f "$USR_IMG" || USR_IMG="$(pwd)/$(ls tizen-*-target-*odroid*.tar.gz)" ;; *artik*) BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*artik*.tar.gz)" diff --git a/tsp/scripts/publish.py b/tsp/scripts/publish.py index b9237d1..91e906a 100755 --- a/tsp/scripts/publish.py +++ b/tsp/scripts/publish.py @@ -33,7 +33,7 @@ USAGE = "%prog <db>" AGENT = "%s/%s" % (__name__, __version__) COLORS = ["#fff", "#ddd"] -SCREENSHOTABLE = ["odroid", "artik5", "artik10", "artik5"] +SCREENSHOTABLE = ["ivi-odroid", "tv-odroid", "common-odroid", "artik5", "artik10"] def print_head(row): template = jinja2.Template('<tr>\n\ diff --git a/tsp/tree_unified b/tsp/tree_unified index b90ee09..5ff8a8f 100644 --- a/tsp/tree_unified +++ b/tsp/tree_unified @@ -12,7 +12,10 @@ images/standard/common-emulator-wayland-mbr-i586/MD5SUMS images/standard/common-installer-efi-x86_64/MD5SUMS images/standard/common-boot-armv7l-artik10/MD5SUMS images/standard/common-wayland-3parts-armv7l-odroidu3/MD5SUMS +images/standard/tv-wayland-3parts-armv7l-odroidu3/MD5SUMS images/standard/common-boot-armv7l-artik5/MD5SUMS images/standard/common-boot-armv7l-odroidu3/MD5SUMS +images/standard/tv-boot-armv7l-odroidu3/MD5SUMS images/standard/common-installer-mbr-i586/MD5SUMS images/standard/common-wayland-efi-x86_64/MD5SUMS +images/standard/ivi-target-odroidxu3/MD5SUMS |