diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-03-30 18:26:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2020-03-30 18:26:41 +0000 |
commit | bd12ba03d7eb58c74630bcc8354338f400f0e4d6 (patch) | |
tree | 9a2d10ba3b04924d7a112fc444d6662f382fe2b2 /jjb/common/include-agl-run-test-rsync-changeid.sh | |
parent | 567eae96717b279ccf7a4a8d475660daa6b94eed (diff) | |
parent | 47533a77f8826718e7f79cce01ec9bc1e03bfadb (diff) |
Merge "SPEC-2962: permit to have more than one board per build"
Diffstat (limited to 'jjb/common/include-agl-run-test-rsync-changeid.sh')
-rw-r--r-- | jjb/common/include-agl-run-test-rsync-changeid.sh | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh index e576da04..41fe2b48 100644 --- a/jjb/common/include-agl-run-test-rsync-changeid.sh +++ b/jjb/common/include-agl-run-test-rsync-changeid.sh @@ -10,7 +10,6 @@ echo "\n\n\n" export RSYNCDST="/srv/download/AGL/upload/ci/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}" export RSYNCSRC=$(pwd)/UPLOAD/ -export RSYNCSRCstorage=$(pwd)/UPLOADstorage/ # construct upload folder mv UPLOAD UPLOAD2 || true @@ -18,9 +17,6 @@ rm -rf UPLOAD2 || true mkdir -p UPLOAD/${MACHINE} export DEST=$(pwd)/UPLOAD/${MACHINE} -export DEST2=$(pwd)/UPLOADstorage/AGL/upload/ci/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/ -mkdir -p ${DEST2} - cd $REPODIR cd output @@ -30,30 +26,30 @@ ls -alhR tmp/deploy/images #set -x -echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}" -echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}" - -## fixed in releng with --branch -# workaround for thud until fixed in templates: -#if [ ! -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} -a -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} ] ; then -# cp -avL tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} -#fi - -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; do - FILE=$(eval echo \$${i}) - if [ -n "$FILE" ]; then - cp -avL tmp/deploy/images/${TARGETMACHINE}/${FILE} ${DEST}/ - cp -avL tmp/deploy/images/${TARGETMACHINE}/${FILE} ${DEST2}/ - fi +for board in $(ls $BOARDOUT) +do + . $BOARDOUT/$board/info + echo "INFO: copy artifact for $x_releng_device/$x_lava_device" + echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}" + echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}" + + if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then + cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/ + fi + + # copy files to $DEST (only if variable is non-empty) + 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}/ + fi + done done set +x +# for the moment, nothing more use this directory, clean it +rm -r $BOARDOUT + tree $DEST ls -alhR $DEST |