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/cts-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/cts-host.yaml')
| -rw-r--r-- | android/cts-host.yaml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/android/cts-host.yaml b/android/cts-host.yaml index 85252a5..c0a4b03 100644 --- a/android/cts-host.yaml +++ b/android/cts-host.yaml @@ -24,6 +24,10 @@ install: - libc6:i386 - libncurses5:i386 - libstdc++6:i386 + - android-tools-adb + - android-tools-fastboot + steps: + - apt-get install -y $JDK $JRE params: JDK: "default-jdk" @@ -34,15 +38,19 @@ params: run: steps: - - apt-get install -y $JDK $JRE - lava-wait $TEST_NAME-send-ip - IPADDR=`awk -F '=' '{print $2}' /tmp/lava_multi_node_cache.txt` - - export REGEX="([1-9]?[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])" - - echo $IPADDR | grep -P $REGEX - - if [ $? -eq 0 ]; then adb connect $IPADDR; IPADDR=$IPADDR:5555; fi + - if [ $IPADDR != "_MISSING_" ] + - then + - ". ./android/scripts/adb_connect.sh $IPADDR" + - echo $CTS_URL + - echo $IPADDR + - echo $TEST_PARAMS + - adb devices - adb -s $IPADDR wait-for-device - "./android/scripts/cts.py $CTS_URL $IPADDR $TEST_PARAMS" - echo "processes running" - ps + - fi - lava-sync $TEST_NAME-finished |