[Git][qa/jenkins.debian.net][master] r.d.n: enable services later once everything is set up

[Holger Levsen (@holger)]

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


Commits:
5e2babc9 by Holger Levsen at 2025-04-11T20:47:58+02:00
r.d.n: enable services later once everything is set up

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

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -779,50 +779,6 @@ case $HOSTNAME in
 			*) ;;
 esac
 
-deploy_rebuilderd_services() {
-				sudo systemctl enable --now rebuilderd_boot_cleanup.service
-				cd /etc/systemd/system
-				if [ "$1" = "worker" ] ; then
-					for i in $(seq 1 $2) ; do
-						sudo ln -sf rebuilderd-worker at .service rebuilderd-worker@${i}.service
-						sudo systemctl enable --now rebuilderd-worker@${i}.service
-					done
-				elif [ "$1" = "rebuilderd" ] ; then
-					for i in $2 ; do
-						sudo ln -sf rebuilderd at .service rebuilderd@${i}.service
-						sudo systemctl enable --now rebuilderd@${i}.service
-					done
-				elif [ "$1" = "pkgsync" ] ; then
-					for i in $2 ; do
-						sudo ln -sf rebuilderd-pkgsync at .service rebuilderd-pkgsync@${i}.service
-						sudo ln -sf rebuilderd-pkgsync at .timer rebuilderd-pkgsync@${i}.timer
-						sudo systemctl enable --now rebuilderd-pkgsync@${i}.timer
-					done
-				fi
-				cd -
-}
-
-case $HOSTNAME in
-	codethink01*|codethink02*)		deploy_rebuilderd_services worker 5
-						;;
-	infom07*)				deploy_rebuilderd_services worker 5
-						;;
-	infom08*)				deploy_rebuilderd_services worker 3
-						;;
-	ionos17*)				deploy_rebuilderd_services worker 8
-						;;
-	osuosl4*)				deploy_rebuilderd_services worker 8
-						;;
-	riscv64*)				deploy_rebuilderd_services worker 3
-						;;
-	*ppc64el)				deploy_rebuilderd_services worker 3
-						;;
-	osuosl5*)				deploy_rebuilderd_services rebuilderd "all amd64 arm64 armhf i386 riscv64 ppc64el"
-						deploy_rebuilderd_services pkgsync    "all amd64 arm64 armhf i386 riscv64 ppc64el"
-						;;
-	*) 					;;
-esac
-
 if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "ionos7-amd64" ] ; then
 	if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/apache2 -nt $STAMP ]  ; then
 		if [ ! -e /etc/apache2/mods-enabled/proxy.load ] ; then
@@ -989,6 +945,50 @@ if [ "$HOSTNAME" = "jenkins" ] ; then
 	explain "user content for jenkins updated."
 fi
 
+deploy_rebuilderd_services() {
+				sudo systemctl enable --now rebuilderd_boot_cleanup.service
+				cd /etc/systemd/system
+				if [ "$1" = "worker" ] ; then
+					for i in $(seq 1 $2) ; do
+						sudo ln -sf rebuilderd-worker at .service rebuilderd-worker@${i}.service
+						sudo systemctl enable --now rebuilderd-worker@${i}.service
+					done
+				elif [ "$1" = "rebuilderd" ] ; then
+					for i in $2 ; do
+						sudo ln -sf rebuilderd at .service rebuilderd@${i}.service
+						sudo systemctl enable --now rebuilderd@${i}.service
+					done
+				elif [ "$1" = "pkgsync" ] ; then
+					for i in $2 ; do
+						sudo ln -sf rebuilderd-pkgsync at .service rebuilderd-pkgsync@${i}.service
+						sudo ln -sf rebuilderd-pkgsync at .timer rebuilderd-pkgsync@${i}.timer
+						sudo systemctl enable --now rebuilderd-pkgsync@${i}.timer
+					done
+				fi
+				cd -
+}
+
+case $HOSTNAME in
+	codethink01*|codethink02*)		deploy_rebuilderd_services worker 5
+						;;
+	infom07*)				deploy_rebuilderd_services worker 5
+						;;
+	infom08*)				deploy_rebuilderd_services worker 3
+						;;
+	ionos17*)				deploy_rebuilderd_services worker 8
+						;;
+	osuosl4*)				deploy_rebuilderd_services worker 8
+						;;
+	riscv64*)				deploy_rebuilderd_services worker 3
+						;;
+	*ppc64el)				deploy_rebuilderd_services worker 3
+						;;
+	osuosl5*)				deploy_rebuilderd_services rebuilderd "all amd64 arm64 armhf i386 riscv64 ppc64el"
+						deploy_rebuilderd_services pkgsync    "all amd64 arm64 armhf i386 riscv64 ppc64el"
+						;;
+	*) 					;;
+esac
+
 if [ "$HOSTNAME" = "jenkins" ] ; then
 	#
 	# run jenkins-job-builder to update jobs if needed



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/5e2babc96d40afc3419cc6ccbc5b93273f9f975e
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/20250411/9f542dff/attachment-0001.htm>