diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2019-05-21 09:43:40 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2019-05-30 14:10:41 +0000 |
| commit | 2b1fa5920fac9a6c5794c83c887b9c8c11bce39e (patch) | |
| tree | ac272031933f5b8455f3c64bef6f48f687da8ee2 /openembedded-lkft | |
| parent | 692ac4f13f4b4a5430c54a5f1720926ed33d656a (diff) | |
Revert "Revert "lkft: add x15 to the ssuite run""
LKFT: Reintroduce ssuite for x15 but not for kernel v4.4 since that
doesn't support fragment CONFIG_PHY_BRCM_SATA.
This reverts commit 75375effa603b00444ef59539bffe25bf3a96b6f.
Change-Id: Iff75368fac478e919e42850c69b13cf4a9ea94c9
Diffstat (limited to 'openembedded-lkft')
| -rw-r--r-- | openembedded-lkft/lava-job-definitions/devices/x15 | 21 | ||||
| -rwxr-xr-x | openembedded-lkft/submit_for_testing.sh | 8 |
2 files changed, 27 insertions, 2 deletions
diff --git a/openembedded-lkft/lava-job-definitions/devices/x15 b/openembedded-lkft/lava-job-definitions/devices/x15 index 4be8fca5..a7d0012b 100644 --- a/openembedded-lkft/lava-job-definitions/devices/x15 +++ b/openembedded-lkft/lava-job-definitions/devices/x15 @@ -37,3 +37,24 @@ minutes: 15 method: u-boot {% endblock boot_target %} + +{% block test_target %} + {{ super() }} + - from: inline + repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: prep-tmp-disk + description: "Mount local disk for tmp space" + run: + steps: + - 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 %} diff --git a/openembedded-lkft/submit_for_testing.sh b/openembedded-lkft/submit_for_testing.sh index 0928220a..0a7b06e0 100755 --- a/openembedded-lkft/submit_for_testing.sh +++ b/openembedded-lkft/submit_for_testing.sh @@ -124,8 +124,12 @@ for test in ${TEST_FILES}; do FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}" fi elif [[ ${test} = "ssuite.yaml" ]];then - if [[ ${DEVICE_TYPE} = "x86" ]];then - FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}" + if [[ ${DEVICE_TYPE} = "x86" || ${DEVICE_TYPE} = "x15" ]];then + if [[ ${DEVICE_TYPE} = "x15" && "${MAKE_KERNELVERSION}" == 4.4* ]];then + echo "no testplan for ${DEVICE_TYPE} and kernel verison: ${MAKE_KERNELVERSION}" + else + FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}" + fi fi elif [[ ${test} = "network-basic-tests.yaml" ]];then if [[ ${DEVICE_TYPE} != "dragonboard-410c" ]];then |