Merge pull request #15 from kateyy/tradefed_shards_with_retry
Add MultiNode TradeFed tests for --shards and with session retry
diff --git a/automated/android/noninteractive-tradefed/monitor_adb.sh b/automated/android/noninteractive-tradefed/monitor_adb.sh
new file mode 100755
index 0000000..368b5cb
--- /dev/null
+++ b/automated/android/noninteractive-tradefed/monitor_adb.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -x
+while true;
+do
+ date
+ lsusb
+ adb devices
+ sleep 30
+done
diff --git a/automated/android/noninteractive-tradefed/monitor_fastboot.sh b/automated/android/noninteractive-tradefed/monitor_fastboot.sh
index 2345cab..66e38a1 100755
--- a/automated/android/noninteractive-tradefed/monitor_fastboot.sh
+++ b/automated/android/noninteractive-tradefed/monitor_fastboot.sh
@@ -1,4 +1,7 @@
#!/bin/sh -x
-while true; do
-fastboot boot /lava-lxc/boot*.img
+while true;
+do
+ date
+ fastboot boot /lava-lxc/boot*.img
+ sleep 30
done
diff --git a/automated/android/noninteractive-tradefed/setup.sh b/automated/android/noninteractive-tradefed/setup.sh
index 0aba3b5..fa0527c 100755
--- a/automated/android/noninteractive-tradefed/setup.sh
+++ b/automated/android/noninteractive-tradefed/setup.sh
@@ -18,7 +18,7 @@
# Use Jdk9 for all other builds
JDK="openjdk-9-jdk-headless"
fi
-PKG_DEPS="usbutils curl wget zip xz-utils python-lxml python-setuptools python-pexpect aapt lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 python-dev python-protobuf protobuf-compiler python-virtualenv python-pip python-pexpect psmisc"
+PKG_DEPS="coreutils usbutils curl wget zip xz-utils python-lxml python-setuptools python-pexpect aapt lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 python-dev python-protobuf protobuf-compiler python-virtualenv python-pip python-pexpect psmisc"
dist_name
case "${dist}" in
diff --git a/automated/android/noninteractive-tradefed/tradefed.yaml b/automated/android/noninteractive-tradefed/tradefed.yaml
index fbb5635..caab9c6 100644
--- a/automated/android/noninteractive-tradefed/tradefed.yaml
+++ b/automated/android/noninteractive-tradefed/tradefed.yaml
@@ -51,7 +51,8 @@
# create test use to run the cts/vts tests
- useradd -m testuser && echo "testuser created successfully"
- chown testuser:testuser .
- - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then ./monitor_fastboot.sh & fi
+ - if echo "${TEST_REBOOT_EXPECTED}" |grep -i "true" ; then ./monitor_fastboot.sh & fi
+ - ./monitor_adb.sh &
- sudo -u testuser ./tradefed.sh -o "${TIMEOUT}" -c "${TEST_URL}" -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULTS_FORMAT}" -n "${ANDROID_SERIAL}" -f "${FAILURES_PRINTED}" -a "${AP_SSID}" -k "${AP_KEY}"
# Upload test log and result files to artifactorial.
- cp -r ./${TEST_PATH}/results ./output/ || true
@@ -66,4 +67,5 @@
- userdel testuser -f -r || true
# When adb device lost, end test job to mark it as 'incomplete'.
- if ! adb shell echo ok; then error_fatal "adb device $ANDROID_SERIAL lost!"; fi
- - if [ "${TEST_REBOOT_EXPECTED,,}" = "true" ]; then killall monitor_fastboot.sh; fi
+ - if echo "${TEST_REBOOT_EXPECTED}" |grep -i "true" ; then killall monitor_fastboot.sh; fi
+ - killall monitor_adb.sh
diff --git a/automated/linux/ltp/skipfile-lkft.yaml b/automated/linux/ltp/skipfile-lkft.yaml
index 39a7d4f..6ee2d30 100644
--- a/automated/linux/ltp/skipfile-lkft.yaml
+++ b/automated/linux/ltp/skipfile-lkft.yaml
@@ -202,3 +202,35 @@
- all
tests:
- hugemmap06
+
+ - reason: >
+ LTP: mtest06/mmap1 running long time and timeouted after 15 minutes
+ intermittent failure
+ url: https://bugs.linaro.org/show_bug.cgi?id=4273
+ environments: all
+ boards:
+ - dragonboard-410c
+ - hi6220-hikey
+ - juno-r2
+ - qemu_arm64
+ branches:
+ - 4.4
+ - 4.9
+ - 4.14
+ - 4.20
+ - mainline
+ tests:
+ - mtest06
+
+ - reason: >
+ LTP mm test case ksm01 failed on db410c while allocating memory,
+ mem.c:293: malloc(134217600) failed: ENOMEM
+ Board doesn't have enough memory to run the test (1GB)
+ url: https://bugs.linaro.org/show_bug.cgi?id=4272
+ environments: production
+ boards:
+ - dragonboard-410c
+ branches:
+ - all
+ tests:
+ - ksm01