From 7089cf126abf41391ca7f87754b2cf01a7d13d83 Mon Sep 17 00:00:00 2001
From: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Date: Tue, 12 Feb 2019 12:25:50 +0000
Subject: noninteractive-tradefed: add more debug

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
---
 automated/android/noninteractive-tradefed/monitor_adb.sh      | 8 ++++++++
 automated/android/noninteractive-tradefed/monitor_fastboot.sh | 7 +++++--
 automated/android/noninteractive-tradefed/setup.sh            | 2 +-
 automated/android/noninteractive-tradefed/tradefed.yaml       | 2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100755 automated/android/noninteractive-tradefed/monitor_adb.sh

(limited to 'automated/android')

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 @@ else
     # 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..a9f97dc 100644
--- a/automated/android/noninteractive-tradefed/tradefed.yaml
+++ b/automated/android/noninteractive-tradefed/tradefed.yaml
@@ -52,6 +52,7 @@ run:
         - useradd -m testuser && echo "testuser created successfully"
         - chown testuser:testuser .
         - if [ "${TEST_REBOOT_EXPECTED,,}" = "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
@@ -67,3 +68,4 @@ run:
         # 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
+        - killall monitor_adb.sh
-- 
cgit v1.2.3