From: Jan-Simon Möller Date: Fri, 31 May 2019 11:34:10 +0000 (+0200) Subject: Skip build-info if it does not exist X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=1ddfd9f5d15733d1ab02d6ed204cd332626d7e4f;p=ci-management.git Skip build-info if it does not exist This fixes https://gerrit.automotivelinux.org/gerrit/#/c/AGL/meta-agl-demo/+/21462/ . Change-Id: I5b00fe9ee35299bf0938c606c6acd9fcfa2af1ae Signed-off-by: Jan-Simon Möller --- diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh index 9c218f96..033ca8c0 100644 --- a/jjb/common/include-agl-run-test-rsync-changeid.sh +++ b/jjb/common/include-agl-run-test-rsync-changeid.sh @@ -39,9 +39,13 @@ echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}" # cp -avL tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} #fi -BUILD_INFO=build-info +if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then + cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/ + cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST2}/ +fi + # copy files to $DEST (only if variable is non-empty) -for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT BUILD_INFO; do +for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT; do FILE=$(eval echo \$${i}) if [ -n "$FILE" ]; then cp -avL tmp/deploy/images/${TARGETMACHINE}/${FILE} ${DEST}/