From 363e268cdcd3e7409f80ac1b9a8e6a78ff1c0ad1 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Wed, 3 Apr 2024 11:55:51 +0200
Subject: [PATCH] jenkins-common: fix_perms: chown files too

Ensure the user that runs docker owns files in cache and data dirs
during fix_perms, if an old job created them as root.

Change-Id: I43af48bd87e27abad5ad52e734256d78651f67c3
---
 jenkins-common.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jenkins-common.sh b/jenkins-common.sh
index 59224a02..f22158b5 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -386,7 +386,10 @@ fix_perms() {
 			-v $CACHE_DIR:/cache \
 			--name ${BUILD_TAG}-cleaner \
 			"debian:$DEBIAN_DEFAULT" \
-			chmod -R a+rX /data/ /cache/
+			sh -e -x -c "
+				chmod -R a+rX /data/ /cache/
+				chown -R $(id -u):$(id -g) /data /cache
+			"
 }
 
 collect_logs() {