[Git][qa/jenkins.debian.net][master] 2 commits: reproducible debian: fix pgrep call now that the build worker is invoked differently

[Mattia Rizzolo (@mattia)]

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


Commits:
b7aca83a by Mattia Rizzolo at 2024-03-09T20:46:11+01:00
reproducible debian: fix pgrep call now that the build worker is invoked differently

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

- - - - -
ad4f2324 by Mattia Rizzolo at 2024-03-09T20:48:28+01:00
reproducible arch: move the temporary directories into a single arch dir, for clarity

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

- - - - -


3 changed files:

- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_build_service.sh
- bin/reproducible_worker.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -345,7 +345,7 @@ trap cleanup_all INT TERM EXIT
 #
 if [ "$1" = "" ] ; then
 	MODE="master"
-	TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t archlinuxrb-build-XXXXXXXX)  # where everything actually happens
+	TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results/archlinux -d -t rb-build-XXXXXXXX)  # where everything actually happens
 	SOURCE_DATE_EPOCH=$(date +%s)
 	cd $TMPDIR
 elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
@@ -442,7 +442,7 @@ if [ -n "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.zst 2>/dev/null|| true)" ] ; then
 		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] && [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then
 			echo "$(date -u) - running diffoscope on the results now:"
 			TIMEOUT="60m"
-			DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || echo 'diffoscope-unknown-version')"
+			DIFFOSCOPE="$(schroot --directory "$TMPDIR" -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || echo 'diffoscope-unknown-version')"
 			echo "$(date -u) - Running $DIFFOSCOPE now..."
 			call_diffoscope $SRCPACKAGE $ARTIFACT
 		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] || [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then


=====================================
bin/reproducible_build_service.sh
=====================================
@@ -61,7 +61,7 @@ startup_workers() {
 
 			# systemd can be in weird state, so just look at what real
 			# processes are around, don't look at what systemd think it's running
-			if pgrep -f "$WORKER_BIN $WORKER_NAME " 2> /dev/null ; then
+			if pgrep -f "$WORKER_BIN $WORKER_NAME" 2> /dev/null ; then
 				echo "$(date --utc) - '$(basename $WORKER_BIN) $WORKER_NAME' already running, thus moving on to the next."
 				continue
 			fi


=====================================
bin/reproducible_worker.sh
=====================================
@@ -135,9 +135,9 @@ main_loop() {
 #
 # check if we really should be running
 #
-if pgrep -f "$0 $1 " >/dev/null ; then
+if pgrep -f "$0 $1" >/dev/null ; then
 	echo "$(date --utc) - '$0 $1' already running:"
-	pgrep -f -a "$0 $1 "
+	pgrep -f -a "$0 $1"
 	echo "$(date --utc) - stopping the current process."
 	exit 10
 fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a956ff081eb4ff8da09ca78cdfeb6c82c5e7d84a...ad4f232455f67c7de796c97a510b414af74dade4

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a956ff081eb4ff8da09ca78cdfeb6c82c5e7d84a...ad4f232455f67c7de796c97a510b414af74dade4
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/65cb55b1/attachment-0001.htm>