diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-10-15 11:46:56 +0100 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-10-15 11:46:56 +0100 |
| commit | 2c942c14c6afb7556d9b1caa389ef2bd07949bb3 (patch) | |
| tree | 8b5ca03c54acb70dda7bf486879fa273928c13bd /android | |
| parent | 331016b4a532197ecabd6cc5bf0b9b86b8cbcbec (diff) | |
Android: fixed broken condition in multinode target
Now multinode targed will send _MISSING_ only in case both IP address
and serial number are missing. This should fix the issues with failing
multinode jobs.
Change-Id: I1d4661f45eb5a9d1bf91adb3ad39ff3ad327f2fa
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'android')
| -rw-r--r-- | android/multinode-target.yaml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/android/multinode-target.yaml b/android/multinode-target.yaml index 185aab8..c10e66c 100644 --- a/android/multinode-target.yaml +++ b/android/multinode-target.yaml @@ -28,10 +28,14 @@ params: run: steps: - - lava-test-case step1-cat-build-info --shell cat /system/build.prop + - lava-test-case step1a-cat-build-info --shell cat /system/build.prop + - lava-test-case step1b-$SIGNAL_PREFIX-getprop --shell getprop - SERIALNO=$(getprop ro.serialno) - IPADDR=$(getprop dhcp.eth0.ipaddress) - - if [ $ADB_LINK != "ETH" ] && [ ! -z $SERIALNO ]; then IPADDR=$SERIALNO; fi + - if [ $ADB_LINK != "ETH" ] && [ ! -z $SERIALNO ] + - then + - IPADDR=$SERIALNO + - fi - if [ $ADB_LINK = "ETH" ] && [ ! -z $IPADDR ] - then - lava-test-case step2-get-adb --shell getprop service.adb.tcp.port @@ -41,7 +45,9 @@ run: - 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 - - else + - 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 |