diff options
author | Neil Williams <neil.williams@linaro.org> | 2018-01-30 09:21:10 +0000 |
---|---|---|
committer | Matt Hart <matthew.hart@linaro.org> | 2018-02-01 13:34:50 +0000 |
commit | 85f6bd67c04bcc273c500b65643a993c234d6ed5 (patch) | |
tree | ebe65aa12fe1121637ce06ac4eadefaa54b58586 /lava_scheduler_app/tests/device-types | |
parent | bbf6c5bb48e9f9c5621a8a65c1d6a52da3fa09e7 (diff) |
Test shell helper support with base-fastboot
Ensure that lava-target-ip and lava-target-mac are supported
by base-fastboot. Correct the quoting of the adb and fastboot
serial numbers for instances where the device dictionary value
could be parsed as a number.
Change-Id: Ibffbbec7a15ffd54389740a349da1b9cc596ce56
Diffstat (limited to 'lava_scheduler_app/tests/device-types')
-rw-r--r-- | lava_scheduler_app/tests/device-types/base-fastboot.jinja2 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lava_scheduler_app/tests/device-types/base-fastboot.jinja2 b/lava_scheduler_app/tests/device-types/base-fastboot.jinja2 index 86b6ec412..470c5e637 100644 --- a/lava_scheduler_app/tests/device-types/base-fastboot.jinja2 +++ b/lava_scheduler_app/tests/device-types/base-fastboot.jinja2 @@ -1,9 +1,5 @@ {% extends 'base.jinja2' %} -{% block vland %} -{# skip the parameters dict at top level #} -{% endblock vland %} - {% set adb_serial_number = adb_serial_number|default("'0000000000'") %} {% set fastboot_serial_number = fastboot_serial_number|default("'0000000000'") %} {% set soft_reboot_command = soft_reboot_command|default('adb -s ' + fastboot_serial_number + ' reboot bootloader') %} @@ -11,8 +7,8 @@ {% block body %} device_type: {{ device_type|default('fastboot') }} -adb_serial_number: {{ adb_serial_number|default("'0000000000'") }} -fastboot_serial_number: {{ fastboot_serial_number|default("'0000000000'") }} +adb_serial_number: '{{ adb_serial_number|default('0000000000') }}' +fastboot_serial_number: '{{ fastboot_serial_number|default('0000000000') }}' fastboot_options: {{ fastboot_options|default([]) }} {% if fastboot_deploy_uboot %} |