summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Mistewicz <a.mistewicz@samsung.com>2017-05-22 09:03:37 (GMT)
committerAleksander Mistewicz <a.mistewicz@samsung.com>2018-07-27 17:09:37 (GMT)
commit6971fe9ddf8613c8a6e0418a60d08a46edbf6f57 (patch)
tree8d44469426bfcaa7a2647f53068e7ddf2f6614ab
parentb02ac60dac018109ca2a1fa5a418ee2e15413863 (diff)
downloadmajor-sandbox/amistewicz/comwor4.zip
major-sandbox/amistewicz/comwor4.tar.gz
major-sandbox/amistewicz/comwor4.tar.bz2
As TITS has been moved on a new hardware some values had to be readjusted. Images are now preserved for a week. Only images of interest are being checked and downloaded. Change-Id: I22c4e494cd86eb0259ebbb97e4d6e5d6734fece7
-rwxr-xr-xtct/common.sh6
-rwxr-xr-xtsp/common.sh5
-rw-r--r--tsp/image_map.example7
-rw-r--r--tsp/tree_unified16
-rwxr-xr-xtsp/watchers/watch_diskspace.sh6
-rwxr-xr-xtsp/watchers/watcher.sh2
6 files changed, 10 insertions, 32 deletions
diff --git a/tct/common.sh b/tct/common.sh
index de21475..015e451 100755
--- a/tct/common.sh
+++ b/tct/common.sh
@@ -29,9 +29,9 @@ die() {
# INIT_SLEEP <= RESTART_SLEEP <= MAX_SLEEP
INC_SLEEP=10
-INIT_SLEEP=120
-RESTART_SLEEP=140
-MAX_SLEEP=160
+INIT_SLEEP=40
+RESTART_SLEEP=60
+MAX_SLEEP=80
TL_IP_CONF="/etc/opt/testlab-major/ip_addr"
SCREENSHOOTER_RPM="/opt/screenshooter.rpm"
diff --git a/tsp/common.sh b/tsp/common.sh
index 866b419..e4af955 100755
--- a/tsp/common.sh
+++ b/tsp/common.sh
@@ -34,7 +34,8 @@ die() {
# * common-odroid, tv-odroid
# * mbr64
# * headless-rpi3, gpstracker-rpi3, common-rpi3, tv-rpi3
-TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 common-odroid tv-odroid ivi-odroid headless-rpi3 common-rpi3 tv-rpi3"
+#TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 common-odroid tv-odroid ivi-odroid headless-rpi3 common-rpi3 tv-rpi3"
+TARGET_LIST="artik10 artik710 artik530 common-odroid tv-odroid headless-rpi3 common-rpi3 tv-rpi3"
test -z "${TSP_DIR}" || {
export TS_ONFINISH="${TSP_DIR}/scripts/log.sh"
@@ -82,7 +83,7 @@ test -d "$TMP_PWB" || mkdir "$TMP_PWB"
test -d "$TMP_PWB_RESULTS" || mkdir "$TMP_PWB_RESULTS"
alias tspoll="TMPDIR=$TMP_POLL TS_SLOTS=1 tsp"
-alias tsmaster="TMPDIR=$TMP_MASTER TS_SLOTS=20 TS_MAXCONN=8192 tsp"
+alias tsmaster="TMPDIR=$TMP_MASTER TS_SLOTS=6 TS_MAXCONN=8192 tsp"
alias tspwb="TMPDIR=$TMP_PWB TS_SLOTS=1 tsp"
alias tsresults="TMPDIR=$TMP_PWB_RESULTS TS_SLOTS=1 tsp"
diff --git a/tsp/image_map.example b/tsp/image_map.example
index c8a12da..b6f5c3f 100644
--- a/tsp/image_map.example
+++ b/tsp/image_map.example
@@ -4,6 +4,7 @@ boot-arm64-tm2
boot-armv7l-artik10
boot-armv7l-artik520
boot-armv7l-artik530
+boot-armv7l-artik533s
boot-armv7l-odroidu3
boot-armv7l-odroidxu3
boot-armv7l-tm1
@@ -13,11 +14,7 @@ headed-3parts-armv7l-artik530_710
headless-2parts-armv7l-artik520
headless-2parts-armv7l-artik530_710
headless-2parts-armv7l-rpi3
-headless-tm1
-installer-efi-x86_64
-installer-mbr-i586
minimal-mbr-x86_64
-target-odroidxu3
wayland-3parts-arm64
wayland-3parts-armv7l-artik
wayland-3parts-armv7l-odroidu3
@@ -31,5 +28,3 @@ wayland-armv7l-tw1
wayland-armv7l-tw2
wayland-efi-i586
wayland-efi-x86_64
-wayland-mbr-i586
-wayland-mbr-x86_64
diff --git a/tsp/tree_unified b/tsp/tree_unified
index e2db276..e33f96d 100644
--- a/tsp/tree_unified
+++ b/tsp/tree_unified
@@ -1,9 +1,5 @@
images/standard/common-boot-armv7l-artik10/MD5SUMS
images/standard/common-boot-armv7l-odroidu3/MD5SUMS
-images/standard/common-boot-armv7l-odroidxu3/MD5SUMS
-images/standard/common-docker-2parts-armv7l-rpi3/MD5SUMS
-images/standard/common-installer-efi-x86_64/MD5SUMS
-images/standard/common-installer-mbr-i586/MD5SUMS
images/standard/common-minimal-mbr-x86_64/MD5SUMS
images/standard/common-wayland-3parts-arm64/MD5SUMS
images/standard/common-wayland-3parts-armv7l-artik/MD5SUMS
@@ -11,8 +7,6 @@ images/standard/common-wayland-3parts-armv7l-odroidu3/MD5SUMS
images/standard/common-wayland-3parts-armv7l-rpi3/MD5SUMS
images/standard/common-wayland-efi-i586/MD5SUMS
images/standard/common-wayland-efi-x86_64/MD5SUMS
-images/standard/common-wayland-mbr-i586/MD5SUMS
-images/standard/common-wayland-mbr-x86_64/MD5SUMS
images/standard/iot-boot-arm64-artik710/MD5SUMS
images/standard/iot-boot-arm64-rpi3/MD5SUMS
images/standard/iot-boot-armv7l-artik520/MD5SUMS
@@ -22,16 +16,6 @@ images/standard/iot-headed-3parts-armv7l-artik530_710/MD5SUMS
images/standard/iot-headless-2parts-armv7l-artik520/MD5SUMS
images/standard/iot-headless-2parts-armv7l-artik530_710/MD5SUMS
images/standard/iot-headless-2parts-armv7l-rpi3/MD5SUMS
-images/standard/ivi-target-odroidxu3/MD5SUMS
-images/standard/mobile-boot-arm64-tm2/MD5SUMS
-images/standard/mobile-boot-armv7l-tm1/MD5SUMS
-images/standard/mobile-headless-tm1/MD5SUMS
-images/standard/mobile-wayland-arm64-tm2/MD5SUMS
-images/standard/mobile-wayland-armv7l-tm1/MD5SUMS
-images/standard/mobile-wayland-armv7l-tm2/MD5SUMS
images/standard/tv-boot-armv7l-odroidu3/MD5SUMS
-images/standard/tv-boot-armv7l-odroidxu3/MD5SUMS
images/standard/tv-wayland-armv7l-odroidu3/MD5SUMS
images/standard/tv-wayland-armv7l-rpi3/MD5SUMS
-images/standard/wearable-wayland-armv7l-tw1/MD5SUMS
-images/standard/wearable-wayland-armv7l-tw2/MD5SUMS
diff --git a/tsp/watchers/watch_diskspace.sh b/tsp/watchers/watch_diskspace.sh
index 9fbe67d..ffe576d 100755
--- a/tsp/watchers/watch_diskspace.sh
+++ b/tsp/watchers/watch_diskspace.sh
@@ -27,15 +27,15 @@ PER="${PER%\%*}"
if [ "$PER" -ge 80 ]
then
- nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 1)"
+ nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 7)"
else
if [ "$PER" -ge 60 ]
then
- nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 3)"
+ nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 14)"
else
if [ "$PER" -ge 40 ]
then
- nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 7)"
+ nr="$(tsmaster -L DISK_CLEANUP sh "${TSP_DIR}/jobs/free_diskspace.sh" 28)"
fi
fi
fi
diff --git a/tsp/watchers/watcher.sh b/tsp/watchers/watcher.sh
index c1fbe29..9f94672 100755
--- a/tsp/watchers/watcher.sh
+++ b/tsp/watchers/watcher.sh
@@ -28,8 +28,6 @@ trigger_if_not_queued() {
}
# Dispatch tsp/jobs/trigger_downloads.sh for common snapshot and prerelease urls
-trigger_if_not_queued 4_SNAPSHOT "http://download.tizen.org/snapshots/tizen/common/" tizen_4.0_snapshot
-trigger_if_not_queued 4_PRERELEASE "http://download.tizen.org/prerelease/tizen/common/" tizen_4.0_prerelease
trigger_if_not_queued 3_SNAPSHOT "http://download.tizen.org/snapshots/tizen/3.0-common/" tizen_3.0_snapshot
trigger_if_not_queued 3_PRERELEASE "http://download.tizen.org/prerelease/tizen/3.0-common/" tizen_3.0_prerelease
trigger_if_not_queued UNI_SNAPSHOT "http://download.tizen.org/snapshots/tizen/unified/" tizen_uni_snapshot