diff options
author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-10-05 18:29:21 +0100 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-10-05 20:17:58 +0100 |
commit | da42f0f046f5093e663ded6426531caf7ea5f295 (patch) | |
tree | c894d3b2172fb5bda0664438d637a77846ffd174 /android/lava-android-test-host.yaml | |
parent | 33d4e18e2daff630629aa9e63154182727be4dd7 (diff) |
Android: Multinode target side unification
CTS and lava-android-test shared almost the same target side YAML files.
This change merges both files into one and adds support for USB only
devices.
To preserve backward compatibility symilnks were created. These should
be considered as deprecated and will be removed after all templates are
migrated to new YAML files.
Change-Id: Ie47eefb2ee5d1872a96925d3d0ec72501ed8fd71
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'android/lava-android-test-host.yaml')
-rw-r--r-- | android/lava-android-test-host.yaml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/android/lava-android-test-host.yaml b/android/lava-android-test-host.yaml index 1993a2a..b9f45b8 100644 --- a/android/lava-android-test-host.yaml +++ b/android/lava-android-test-host.yaml @@ -26,11 +26,17 @@ install: - pip install --upgrade setuptools - cd lava-android-test - python setup.py install + - apt-get install -y $JAVA_PACKAGE deps: - python-pip - python-dev - libyaml-dev - unzip + - libc6:i386 + - libncurses5:i386 + - libstdc++6:i386 + - android-tools-adb + - android-tools-fastboot params: TEST_NAME: "busybox" @@ -39,18 +45,20 @@ params: run: steps: - - apt-add-repository -y http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu - - apt-get update -y - - apt-get install -y android-tools-adb android-tools-fastboot $JAVA_PACKAGE libc6:i386 libncurses5:i386 libstdc++6:i386 - lava-wait $TEST_NAME-${TEST_PARAMS// /_}-send-ip - IPADDR=`awk -F '=' '{print $2}' /tmp/lava_multi_node_cache.txt` - - adb connect $IPADDR - - adb wait-for-device + - if [ $IPADDR != "_MISSING_" ] + - then + - ". ./android/scripts/adb_connect.sh $IPADDR" + - adb devices + - adb -s $IPADDR wait-for-device - lava-android-test install $TEST_NAME - if [[ $TEST_PARAMS != "" ]]; then lava-android-test run -o $TEST_NAME.results -O "$TEST_PARAMS" $TEST_NAME; fi - if [[ $TEST_PARAMS == "" ]]; then lava-android-test run -o $TEST_NAME.results $TEST_NAME; fi - lava-test-run-attach $TEST_NAME.results text/plain - python android/scripts/parse-lat.py -f $TEST_NAME.results -t $TEST_NAME + - ps + - fi - lava-sync $TEST_NAME-${TEST_PARAMS// /_}-finished parse: |