aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2019-04-02 11:48:41 +0200
committerAnders Roxell <anders.roxell@linaro.org>2019-04-03 05:16:14 +0200
commit23d60c0ea63fdc3016911c517d09ded73071de08 (patch)
tree23a2634a4674f917d2d00ab4ebdc0231ba0d25df
parent9a7630c7145fe0974ab332f7bfff2d05f2777e10 (diff)
lkft: use the lava-target-storage
Change-Id: I7488d0c36e073c6196d25cc36eb256710aac9798 Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
-rw-r--r--openembedded-lkft/lava-job-definitions/devices/x8616
1 files changed, 7 insertions, 9 deletions
diff --git a/openembedded-lkft/lava-job-definitions/devices/x86 b/openembedded-lkft/lava-job-definitions/devices/x86
index b305521f36..5069784550 100644
--- a/openembedded-lkft/lava-job-definitions/devices/x86
+++ b/openembedded-lkft/lava-job-definitions/devices/x86
@@ -51,15 +51,13 @@ context:
description: "Mount local disk for tmp space"
run:
steps:
- - df -h
- - mount
- - ls /dev/disk/by-id/ -l
- - export TMPDISK=$(ls /dev/disk/by-id/ata-TOSHIBA_MG03ACA100_*)
- - echo "y" | mkfs -t ext4 ${TMPDISK}
- - mkdir -p /scratch
- - mount ${TMPDISK} /scratch || lava-test-raise "mount failed job exit"
- - df -h
- - mount
+ - 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 /scratch
+ - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
+ - df -h
+ - mount
name: prep-tmp-disk
path: inline/prep.yaml
{% endblock test_target %}