[Git][qa/jenkins.debian.net][master] reproducible debian: fixup from the previous commit

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
c5880e88 by Mattia Rizzolo at 2024-03-09T16:55:13+01:00
reproducible debian: fixup from the previous commit

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_worker.sh
- hosts/jenkins/etc/systemd/system/reproducible_build.service


Changes:

=====================================
bin/reproducible_worker.sh
=====================================
@@ -203,7 +203,7 @@ main_loop() {
 	#
 	BUILD_BASE=/var/lib/jenkins/userContent/reproducible/debian/build_service/$WORKER_NAME
 	if [ -L "$BUILD_BASE"/latest ]; then
-		LAST_ID=$(basename "$( readlink -f latest )")
+		LAST_ID=$(basename "$( readlink -m "$BUILD_BASE/latest" )")
 	else
 		LAST_ID=0
 	fi
@@ -229,8 +229,13 @@ main_loop() {
 	echo "                               see https://tests.reproducible-builds.org/cgi-bin/nph-logwatch?$WORKER_NAME/$BUILD_ID"
 	echo "================================================================================================"
 	echo
+	if [ -z "${XDG_RUNTIME_DIR:-}" ]; then
+		XDG_RUNTIME_DIR="/run/user/$UID"
+		export XDG_RUNTIME_DIR
+	fi
 	RETCODE=0
-	systemd-run --slice-inherit --send-sighup -u "rb-build-$WORKER_NAME-$BUILD_ID" \
+	systemd-run --user --send-sighup --collect --pipe --wait \
+		--slice=rb.slice -u "rb-build-$WORKER_NAME-$BUILD_ID" \
 		/srv/jenkins/bin/reproducible_build.sh "$NODE1" "$NODE2" \
 		> "$BUILD_BASE/$BUILD_ID/console.log" 2>&1 || RETCODE=$?
 


=====================================
hosts/jenkins/etc/systemd/system/reproducible_build.service
=====================================
@@ -1,13 +1,13 @@
 [Unit]
 Description=Build service for reproducible-builds jobs
 ConditionPathExists=!/var/lib/jenkins/NO-RB-BUILDERS-PLEASE
+StartLimitIntervalSec=0
 
 [Service]
 # Restart whenever the script exits, without rate limiting:
 Restart=always
 # special code from _build_service for when NO-RB-BUILDERS-PLEASE exists, to properly quit
 RestartPreventExitStatus=9
-StartLimitIntervalSec=0
 User=jenkins
 Group=jenkins
 ExecStart=/srv/jenkins/bin/reproducible_build_service.sh



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c5880e88b46c26301eb5e3725166507f8140bf35

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c5880e88b46c26301eb5e3725166507f8140bf35
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20240309/8e8f0cdf/attachment-0001.htm>