aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Rue <dan.rue@linaro.org>2018-01-17 11:26:07 -0600
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2018-01-18 08:02:35 +0000
commit7218c817ac5840ef0c553f8a6f1f8cb7e3ad9156 (patch)
tree8a7d73ec600783c980276bd5c56a6d57c39a73bd
parentd0f3daa318b3e5957d21d42553c095f69786dbfa (diff)
openembedded-lkft: juno: Use lava-target-storage
Convert to using lava-target-storage mechanism. Note that currently, 4.4 jobs cannot detect the SATA drive due to https://projects.linaro.org/projects/CTT/queues/issue/CTT-894. Meanwhile, without this patch, jobs that run on juno-r2-05 or juno-r2-06 are not using secondary storage because the mkfs is silently failing, causing some test failures. Change-Id: I03af9538179d6288cf2ed8ff047a310c810d69f3 Signed-off-by: Dan Rue <dan.rue@linaro.org>
-rw-r--r--openembedded-lkft/lava-job-definitions/devices/juno-r27
1 files changed, 4 insertions, 3 deletions
diff --git a/openembedded-lkft/lava-job-definitions/devices/juno-r2 b/openembedded-lkft/lava-job-definitions/devices/juno-r2
index 4301dad525..2dfe8ec63e 100644
--- a/openembedded-lkft/lava-job-definitions/devices/juno-r2
+++ b/openembedded-lkft/lava-job-definitions/devices/juno-r2
@@ -63,10 +63,11 @@ context:
description: "Device preparation"
run:
steps:
- - lsusb
- - echo "y" | mkfs -t ext4 /dev/sda1
+ - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB)
+ - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit"
+ - echo "y" | mkfs -t ext4 ${STORAGE_DEV} || lava-test-raise "mkfs -t ext4 ${STORAGE_DEV} failed; job exit"
- mkdir -p /ltp-tmp
- - mount /dev/sda1 /ltp-tmp && echo "mounted" || lava-test-raise "mount /dev/sda1 failed job exit"
+ - mount ${STORAGE_DEV} /ltp-tmp && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
- df -h
- mount
name: prep-inline