From 63981bbbc1507b58206f8bff39af86b6fb6403ef Mon Sep 17 00:00:00 2001
From: Lars Erik Wik <lars.erik.wik@northern.tech>
Date: Thu, 30 Oct 2025 11:30:51 +0100
Subject: [PATCH] build-remote: adjust destination directory

The previous path would cause build-remote to try to make the directory
`/output/`. `/` is owned by root. Hence, permissions is denied. I think
it makes more sense to put these files in `$BASEDIR/output/`.

The transfer-results script is only used by build-remote. Hence, this
change should be rather safe.

Ticket: ENT-12603
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
---
 build-scripts/clean-results    | 2 +-
 build-scripts/install-results  | 2 +-
 build-scripts/transfer-results | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-scripts/clean-results b/build-scripts/clean-results
index d0d604179..3810a6ec9 100755
--- a/build-scripts/clean-results
+++ b/build-scripts/clean-results
@@ -27,6 +27,6 @@
 # The `xargs` puts each line as the argument of `rm -rf` to remove the remaining
 # files
 
-(cd "${BASEDIR}/../../../output/${SCHEDULER}" &&
+(cd "${BASEDIR}/output/${SCHEDULER}" &&
     find . -mindepth 1 -maxdepth 1 -type d -and -not -name '.*' -printf '%T@ %f\n' |
     sort -n | head -n-5 | awk '{print $2}' | xargs --no-run-if-empty rm -rf) || true
diff --git a/build-scripts/install-results b/build-scripts/install-results
index e6dcdd0ec..6ac0dddd2 100755
--- a/build-scripts/install-results
+++ b/build-scripts/install-results
@@ -8,7 +8,7 @@
 . "$(dirname "$0")"/functions
 . version
 
-LNK="$BASEDIR/../../../output/$SCHEDULER/current"
+LNK="$BASEDIR/output/$SCHEDULER/current"
 log_debug "Creating soft link from $BUILD_NUMBER to $LNK"
 rm -f "$LNK"
 ln -fs "$BUILD_NUMBER" "$LNK"
diff --git a/build-scripts/transfer-results b/build-scripts/transfer-results
index 2e794e84c..d4176442f 100755
--- a/build-scripts/transfer-results
+++ b/build-scripts/transfer-results
@@ -8,11 +8,11 @@ log_debug "Fetching test results from build machine..."
 BUILDMACHINE="$1"
 
 # Make sure destination directory exits
-mkdir -p "$BASEDIR"/../../../output/"${SCHEDULER}"/"${BUILD_NUMBER}"
+mkdir -p "$BASEDIR"/output/"${SCHEDULER}"/"${BUILD_NUMBER}"
 
 # Copy files from test machine to this machine
 rsync -avr --delete "$BUILDMACHINE:build/output/*" \
-    "$BASEDIR"/../../../output/"${SCHEDULER}"/"${BUILD_NUMBER}" \
+    "$BASEDIR"/output/"${SCHEDULER}"/"${BUILD_NUMBER}" \
     >/tmp/rsync.log
 
 # Remove results from test machine