composite/nightly: keep upload.log and print watch log only at the end

This commit is contained in:
Franco Fichtner 2025-10-21 13:14:25 +02:00
parent e119f51f33
commit cf2a9e71e1

View file

@ -47,7 +47,7 @@ NOERROR=${NOERROR:-"distfiles obsolete options audit test"}
# Number of error lines to log separately
LINES=${LINES:-400}
eval "$(make print-LOGSDIR,PRODUCT_ARCH,PRODUCT_VERSION,STAGEDIR,TARGETDIRPREFIX)"
eval "$(make print-LOGSDIR,PRODUCT_ARCH,PRODUCT_VERSION,STAGEDIR,TARGETDIRPREFIX 2> /dev/null)"
for RECYCLE in $(cd ${LOGSDIR}; find . -name "[0-9]*" -type f | \
sort -r | tail -n +7); do
@ -110,4 +110,6 @@ rm -rf ${LOGSDIR}/latest
mv ${LOGSDIR}/${PRODUCT_VERSION} ${LOGSDIR}/latest
(make upload-log SERVER=${SERVER} UPLOADDIR=${UPLOADDIR} \
VERSION=${PRODUCT_VERSION} 2>&1) > /dev/null
VERSION=${PRODUCT_VERSION} 2>&1) > ${LOGSDIR}/latest/upload.log
cat ${LOGSDIR}/latest/watch.log