[Git][qa/jenkins.debian.net][master] 2 commits: further fix this check

[Mattia Rizzolo (@mattia)]

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


Commits:
4c71c3b3 by Mattia Rizzolo at 2024-03-09T21:35:37+01:00
further fix this check

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

- - - - -
790aea95 by Mattia Rizzolo at 2024-03-09T21:36:55+01:00
reproducible debian: re-enable just a couple of i386 and armhf builders

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

- - - - -


2 changed files:

- bin/reproducible_build_workers
- bin/reproducible_worker.sh


Changes:

=====================================
bin/reproducible_build_workers
=====================================
@@ -41,14 +41,14 @@ amd64_28            ionos15-amd64           ionos11-amd64
 
 
 # i386
-##i386_1            ionos2-i386             ionos6-i386
+i386_1            ionos2-i386             ionos6-i386
 ##i386_2            ionos6-i386             ionos2-i386
 ##i386_3            ionos2-i386             ionos16-i386
 ##i386_4            ionos16-i386            ionos2-i386
 ##i386_5            ionos12-i386            ionos6-i386
 ##i386_6            ionos6-i386             ionos12-i386
 ##i386_7            ionos12-i386            ionos16-i386
-##i386_8            ionos16-i386            ionos12-i386
+i386_8            ionos16-i386            ionos12-i386
 #i386_9             ionos2-i386             ionos6-i386
 #i386_10            ionos16-i386            ionos12-i386
 #i386_11            ionos6-i386             ionos2-i386
@@ -91,8 +91,8 @@ arm64_23            codethink03-arm64       codethink04-arm64
 #
 # Don't forget to update README with the number of builders…!
 #
-##armhf_1        cbxi4a-armhf-rb                virt64z-armhf-rb
-##armhf_2        virt32a-armhf-rb                virt64c-armhf-rb
+armhf_1        cbxi4a-armhf-rb                virt64z-armhf-rb
+armhf_2        virt32a-armhf-rb                virt64c-armhf-rb
 ##armhf_3        ff4a-armhf-rb                virt64z-armhf-rb
 ##armhf_4        virt64z-armhf-rb                ff4a-armhf-rb
 ##armhf_5        virt64a-armhf-rb                cbxi4b-armhf-rb


=====================================
bin/reproducible_worker.sh
=====================================
@@ -135,14 +135,10 @@ main_loop() {
 #
 # check if we really should be running
 #
-myself=$$
-#no idea why this doesn't work but splitting like done below does
-#PGREP_OUT=$(pgrep -f "$0 $1" |grep -v $myself)
-PGREP_OUT=$(pgrep -f "$0 $1")
-PGREP_OUT=$(echo "$PGREP_OUT" | grep -v $myself)
+PGREP_OUT=$(pgrep -f "reproducible_worker.sh $1"|grep -v $PPID||true)
 if [ -n "$PGREP_OUT" ]; then
-	echo "$(date --utc) - '$0 $1' already running (I'm $myself):"
-	pgrep -f -a "$0 $1"
+	echo "$(date --utc) - 'reproducible_worker.sh $1' already running (I'm $$, father is $PPID):"
+	pgrep -f -a "reproducible_worker.sh $1"
 	echo "$(date --utc) - stopping the current process."
 	exit 10
 fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/06dde8f8d96a617e5cfdb33b5316776af09ca01c...790aea9561da594ded12bcb05f9d9541418f75f7

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/06dde8f8d96a617e5cfdb33b5316776af09ca01c...790aea9561da594ded12bcb05f9d9541418f75f7
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/035b0826/attachment-0001.htm>