[Git][qa/jenkins.debian.net][master] openqa workers: actually install the worker

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
cbcff03b by Holger Levsen at 2025-09-23T15:18:11+02:00
openqa workers: actually install the worker

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -407,10 +407,14 @@ if [ -f /etc/debian_version ] ; then
 			*)		DEBS="$DEBS fail2ban" ;;
 		esac
 		case $HOSTNAME in
-			osuosl31*) 
-					 DEBS="$DEBS live-build"	# needed for live-build
-					 DEBS="$DEBS swtpm"             # needed for openqa-worker
-					 DEBS="$DEBS cdebootstrap cdebootstrap-static" ;; 	# needed for testing just that
+			ionos10*) 	# needed for live-build
+					DEBS="$DEBS live-build"
+					# needed for testing just that
+					DEBS="$DEBS cdebootstrap cdebootstrap-static"
+					;;
+			osuosl31*)	# needed for openqa-worker
+					DEBS="$DEBS openqa-worker swtpm"
+					;;
 			*) ;;
 		esac
 		# install stuff for bremner's builtin-pho stuff
@@ -826,19 +830,21 @@ if ! $UP2DATE ; then
 						sudo systemctl reset-failed openqa-slirpvde.service || true
 						sudo systemctl disable --now openqa-slirpvde.service || true
 						OPENQA_WORKERS_TO_RUN=7
-						# disable any excess autostart instances, and all non-autostart workers
-						for id in $(systemctl show openqa-worker\*@\*.service --property=Id | sed 's/^Id=//'); do
-							autostart_instance=$(sed -nE 's/^.*auto-restart[@]([0-9]+).*$/\1/p' <<<$id)
-							if [ -z "$autostart_instance" ] || [ "$autostart_instance" -gt "$OPENQA_WORKERS_TO_RUN" ]; then
-								sudo systemctl disable --now $id
-							fi
-						done
-						# if some required instances are not yet enabled, enable them
-						for i in $(seq 1 $OPENQA_WORKERS_TO_RUN); do
-							unit=openqa-worker-auto-restart@$i.service
-							systemctl show $unit --property=UnitFileState | grep -q 'enabled' || \
-								sudo systemctl enable --now $unit
-						done
+						if $(dpkg -l openqa-worker 2>/dev/null) ; then
+							# disable any excess autostart instances, and all non-autostart workers
+							for id in $(systemctl show openqa-worker\*@\*.service --property=Id | sed 's/^Id=//'); do
+								autostart_instance=$(sed -nE 's/^.*auto-restart[@]([0-9]+).*$/\1/p' <<<$id)
+								if [ -z "$autostart_instance" ] || [ "$autostart_instance" -gt "$OPENQA_WORKERS_TO_RUN" ]; then
+									sudo systemctl disable --now $id
+								fi
+							done
+							# if some required instances are not yet enabled, enable them
+							for i in $(seq 1 $OPENQA_WORKERS_TO_RUN); do
+								unit=openqa-worker-auto-restart@$i.service
+								systemctl show $unit --property=UnitFileState | grep -q 'enabled' || \
+									sudo systemctl enable --now $unit
+							done
+						fi
 						;;
 		osuosl32-amd64)			# janitor
 						sudo adduser jenkins sbuild



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/cbcff03b9feece2aa68604d76dfba34fdac37f82
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/20250923/e21d2d62/attachment-0001.htm>