From 77497f4bd85559901925dff82f00f6adff785785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Wed, 29 Apr 2026 14:11:28 +0200
Subject: [PATCH 1/2] [WORKER] Upload the bootcdregtest ISOs as well (#17)

These ISOs are uploaded to: https://iso.reactos.org/temp/

ONLINE-709

Uploading the bootcdregtest ISOs are meant to be used only for diagnostics
purposes, e.g. if a build crashes on a testbot and provides a given stack
trace, one could then download the corresponding test ISO locally and
spelunk into the offending module(s) to check what's going on.
This is mandatory if the crash happens within a built test module
(rostest), since those aren't included by default in the regular
uploaded bootcd.
---
 worker/uploadiso | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/worker/uploadiso b/worker/uploadiso
index 8918348..ac37cf2 100755
--- a/worker/uploadiso
+++ b/worker/uploadiso
@@ -18,20 +18,24 @@ esac
 
 # Check what files we have.
 [ -f "$ROS_OUTPUT/bootcd.iso" ] && BOOTCD=1 || BOOTCD=0
+[ $UPLOAD_REGTESTCD -a -f "${ROS_OUTPUT}/bootcdregtest.iso" ] && REGTESTCD=1 || REGTESTCD=0
 [ -f "$ROS_OUTPUT/livecd.iso" ] && LIVECD=1 || LIVECD=0
 
-if [ $BOOTCD -eq 0 -a $LIVECD -eq 0 ]; then
+if [ $BOOTCD -eq 0 -a $REGTESTCD -eq 0 -a $LIVECD -eq 0 ]; then
 	echo "* There are no ISO files to process."
 	exit 2
 fi
 
 # Rsync them onto the file server.
 BOOT=reactos-bootcd-$REVISION_SUFFIX-$UPLOAD_SUFFIX
+if [ $REGTESTCD ]; then
+	REGT=reactos-bootcdregtest-$REVISION_SUFFIX-$UPLOAD_SUFFIX
+fi
 LIVE=reactos-livecd-$REVISION_SUFFIX-$UPLOAD_SUFFIX
 
 echo "* Rsyncing ISO files onto iso.reactos.org..."
 cd $ROS_OUTPUT
-rsync --stats -e "ssh -l $UPLOAD_USER -i $UPLOAD_KEY" -rtvz --include=bootcd.iso --include=livecd.iso --exclude=* . $UPLOAD_HOST:$UPLOAD_TEMPDIR || exit 1
+rsync --stats -e "ssh -l $UPLOAD_USER -i $UPLOAD_KEY" -rtvz --include=bootcd.iso --include=bootcdregtest.iso --include=livecd.iso --exclude=* . $UPLOAD_HOST:$UPLOAD_TEMPDIR || exit 1
 echo -e "* Done.\n"
 
 # Remotely compress them on the file server and update symbolic links.
@@ -47,6 +51,18 @@ else
 	echo "* There is no $BOOT to compress."
 fi
 
+if [ $REGTESTCD ]; then
+	echo "* Remotely compressing $REGT..."
+	ssh $SSHOPTS "ln $UPLOAD_TEMPDIR/bootcdregtest.iso $UPLOAD_TEMPDIR/$REGT.iso"
+	ssh $SSHOPTS "7za a -bd -t7z $UPLOAD_TEMPDIR/$BOOT.7z $UPLOAD_TEMPDIR/$REGT.iso -mx9 | tail -n +4"
+	ssh $SSHOPTS "rm $UPLOAD_TEMPDIR/$REGT.iso"
+	ssh $SSHOPTS "mv $UPLOAD_TEMPDIR/$REGT.7z $UPLOAD_ISODIR/temp/"
+	ssh $SSHOPTS "chmod 0644 $UPLOAD_ISODIR/temp/$REGT.7z"
+	#ssh $SSHOPTS "ln -snf $REGT.7z $UPLOAD_ISODIR/temp/latest-$UPLOAD_SUFFIX"
+elif [ $UPLOAD_REGTESTCD ]; then
+	echo "* There is no $REGT to compress."
+fi
+
 if [ $LIVECD ]; then
 	echo "* Remotely compressing $LIVE..."
 	ssh $SSHOPTS "ln $UPLOAD_TEMPDIR/livecd.iso $UPLOAD_TEMPDIR/$LIVE.iso"

From ff787ceb7ca9ae5e72c3224846658e2e41bda703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sun, 5 Jul 2026 21:40:17 +0200
Subject: [PATCH 2/2] Cleanup ISOs/7z archives older than 1 week in the ./temp/
 directory, before uploading new ones there

---
 worker/uploadiso | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/worker/uploadiso b/worker/uploadiso
index ac37cf2..2ab4a96 100755
--- a/worker/uploadiso
+++ b/worker/uploadiso
@@ -52,6 +52,10 @@ else
 fi
 
 if [ $REGTESTCD ]; then
+	# Cleanup ISOs/7z archives in the remote /temp/ folder that are older than 1 week.
+	echo "* Remotely cleaning old bootcdregtest ISOs..."
+	ssh $SSHOPTS "find $UPLOAD_ISODIR/temp/ -mindepth 1 -maxdepth 1 '(' -name \"*.iso\" -o -name \"*.7z\" ')' -type f -mtime +7 -delete"
+
 	echo "* Remotely compressing $REGT..."
 	ssh $SSHOPTS "ln $UPLOAD_TEMPDIR/bootcdregtest.iso $UPLOAD_TEMPDIR/$REGT.iso"
 	ssh $SSHOPTS "7za a -bd -t7z $UPLOAD_TEMPDIR/$BOOT.7z $UPLOAD_TEMPDIR/$REGT.iso -mx9 | tail -n +4"