update lava-android-benchmark-target.yaml with multinode

Change-Id: If30f7eb2d34c4fbeffdb078734bb59cc3f3a144f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

1 files changed, 58 insertions, 17 deletions

diff --git a/lava-android-benchmark-target.yaml b/lava-android-benchmark-target.yaml
index ad6a071..ae55e41 100644
--- a/lava-android-benchmark-target.yaml
+++ b/lava-android-benchmark-target.yaml
@@ -1,9 +1,11 @@
 metadata:
-    name: lava-android-benchmark-target
+    name: multinode-target
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Multinode target part for android benchmarking"
+    description: "Run android test that requires host side. Target side.
+                  The value put in params section in this file is default, user can overwrite them by the values in JSON file.
+                  Test can be used with different host side tests"
     maintainer:
-        - milosz.wasilewski@linaro.org
+        -  milosz.wasilewski@linaro.org
     os:
         - android
     scope:
@@ -14,24 +16,63 @@ metadata:
         - vexpress-a9
         - vexpress-tc2
         - juno
+        - mn-nexus9
+    scope:
+        - functional
+        - performance
 
 params:
-    TEST_NAME: "geekbench"
+    TEST_NAME: "android-cts-5.0-armv8"
+    # ADB_LINK parameter is used to pass proper device
+    # identification to the host side. Default is ETH
+    # which means adb-over-ethernet is used
+    ADB_LINK: "ETH"
+    ETH_IFACE: "eth0"
+    # timeout value to wait until the ip ia available for ping LAVA_SERVER_IP
+    PING_TIMEOUT: 10
 
 run:
     steps:
-        - lava-test-case step1-cat-build-info --shell cat /system/build.prop
-        - lava-test-case step2-get-adb --shell getprop service.adb.tcp.port
-        - lava-test-case step3-set-adb --shell setprop service.adb.tcp.port 5555
-        - lava-test-case step4-set-adb-root --shell setprop service.adb.root 1
-        - lava-test-case step5-capture-kmsg-levels --shell 'cat /proc/sys/kernel/printk > /data/local/tmp/kmsg_levels'
-        - lava-test-case step6-disable-kmsg --shell echo '1 1 1 1' > /proc/sys/kernel/printk
-        - lava-test-case step7-stop-adbd --shell stop adbd
-        - lava-test-case step8-start-adbd --shell start adbd
+        - cat /system/build.prop
+        - getprop
+        - SERIALNO=$(getprop ro.serialno)
+        - IPADDR=$(getprop dhcp.$ETH_IFACE.ipaddress)
+        - if [ -z "${IPADDR}" ]; then
+        - IPADDR=$(ifconfig $ETH_IFACE|grep "inet addr:")
+        - IPADDR=${IPADDR#*:}
+        - IPADDR=${IPADDR%% *}
+        - fi
+        - if [ $ADB_LINK != "ETH" ] && [ ! -z $SERIALNO ]
+        - then
+        - IPADDR=$SERIALNO
+        - fi
+        - if [ $ADB_LINK = "ETH" ] && [ ! -z $IPADDR ]
+        - then
+        - cat /proc/sys/kernel/printk > /data/local/tmp/kmsg_levels
+        - echo '1 1 1 1' > /proc/sys/kernel/printk
+        - getprop service.adb.tcp.port
+        - setprop service.adb.tcp.port 5555
+        - setprop service.adb.root 1
+        - stop adbd
+        - start adbd
+        - ping_count=0
+        - while ! LC_ALL=C ping -W1 -c1 ${LAVA_SERVER_IP} ; do
+        - sleep 1; ping_count=$((ping_count + 1)); [ ${ping_count} -ge ${PING_TIMEOUT} ] && exit 1
+        - done
+        - fi
+        - if [ -z $SERIALNO ] && [ -z $IPADDR ]
+        - then
+        # if there is no serial number or IP address available, _MISSING_ is passed to the host
+        - IPADDR="_MISSING_"
+        - fi
+        - lava-send $TEST_NAME-send-ip ipaddr=$IPADDR
+        - if [ -f /data/local/tmp/kmsg_levels ]
+        - then
+        - cat /data/local/tmp/kmsg_levels > /proc/sys/kernel/printk
+        - fi
+        # sleep here to allow for output of kernel messages
+        - sleep 10
+        - lava-wait $TEST_NAME-finished
         - sleep 10
-        - IPADDR=$(getprop dhcp.eth0.ipaddress)
-        - if [ -z $IPADDR ]; then netcfg eth0 up; netcfg eth0 dhcp; IPADDR=$(getprop dhcp.eth0.ipaddress); fi
-        - lava-test-case step6-send-ip --shell lava-send $TEST_NAME-send-ip ipaddr=$IPADDR
-        - lava-test-case step7-enable-kmsg --shell 'cat /data/local/tmp/kmsg_levels > /proc/sys/kernel/printk'
-        - lava-test-case step8-multinode-sync --shell lava-wait $TEST_NAME-finished
+        - lava-test-case test-finished --shell true
         - which lava-sync