diff options
| author | Dan Rue <dan.rue@linaro.org> | 2018-07-18 22:53:18 +0000 |
|---|---|---|
| committer | Daniel Díaz <daniel.diaz@linaro.org> | 2018-07-19 14:49:47 +0000 |
| commit | f75d2b1e5c2a398a4ec13875fafd3e582d9d6bbb (patch) | |
| tree | 06fd214f70401f4e69160bd8b2aa0a9c15639546 /lkft-staging-lava.yaml | |
| parent | 42d01f7a7991d29eb79edbe4efeba7f84650268d (diff) | |
LKFT: Staging: Use -lkft image if it exist
Since fa0c45f4c95 ("openembedded-lkft: use rpb-console-image-lkft for
testing"), the rpb-console-image file may contain "-lkft". Match either
way.
Change-Id: Ib5b590bd3929cdfd4df1457e26021646450575e4
Signed-off-by: Dan Rue <dan.rue@linaro.org>
Diffstat (limited to 'lkft-staging-lava.yaml')
| -rw-r--r-- | lkft-staging-lava.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lkft-staging-lava.yaml b/lkft-staging-lava.yaml index fd2810ad..d479362c 100644 --- a/lkft-staging-lava.yaml +++ b/lkft-staging-lava.yaml @@ -139,12 +139,12 @@ echo "export ${ENVVAR}" >> build_env.sh done . ./build_env.sh - ROOTFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}') - NFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}') - EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}') + ROOTFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}') + NFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}') + EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}') BOOT_FILENAME=$(grep -E "boot\S*uefi\.img" "${MD5_FILENAME}" | awk '{print $2}') KERNEL_FILENAME=$(grep -E "bzImage" "${MD5_FILENAME}" | awk '{print $2}') - HDD_IMG=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg.xz" "${MD5_FILENAME}" | awk '{print $2}') + HDD_IMG=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg.xz" "${MD5_FILENAME}" | awk '{print $2}') case ${DEVICE_TYPE} in juno-r2) KERNEL_FILENAME=$(grep -E " Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}') |