[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] jenkins nodes: keep /srv/workspace on disk on osuosl nodes

[Holger Levsen (@holger)]

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


Commits:
988d3ac3 by Holger Levsen at 2023-04-03T18:03:58+02:00
jenkins nodes: keep /srv/workspace on disk on osuosl nodes

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

- - - - -


2 changed files:

- hosts/common/etc/rc.local
- update_jdn.sh


Changes:

=====================================
hosts/common/etc/rc.local
=====================================
@@ -35,15 +35,6 @@ send_back_to_the_future() {
 	MESSAGE="$MESSAGE in the future"
 }
 
-put_schroots_on_tmpfs() {
-	# keep schroot sessions on tmpfs
-	[ -L /var/lib/schroot ] || echo "$(date -u) - /var/lib/schroot is not a link (to /srv/workspace/varlibschroot/) as it should, please fix manually"
-	mkdir -p /srv/workspace/varlibschroot
-	cd /srv/workspace/varlibschroot || exit 1
-	mkdir -p mount session union unpack
-	mkdir -p union/overlay union/underlay
-}
-
 fixup_shm() {
 	# this is always harmless
 	chmod 1777 /dev/shm
@@ -68,16 +59,6 @@ fixup_shm
 #
 iptables -I INPUT -p udp --dport 111 -j DROP
 
-#
-# put schroots on tmpfs for non debian hosts
-#
-case $(hostname) in
-	osuosl1-amd64)	put_schroots_on_tmpfs ;;
-	osuosl2-amd64)	put_schroots_on_tmpfs ;;
-	osuosl3-amd64)	put_schroots_on_tmpfs ;;
-	*)			;;
-esac
-
 #
 # fixup pbuilder lockfiles if needed
 #


=====================================
update_jdn.sh
=====================================
@@ -227,7 +227,13 @@ case $HOSTNAME in
 			exit 1
 		fi
 		;;
-	jenkins|ionos*amd64|codethink*|osuosl*)
+	osuosl*)
+		if ! grep -q '/srv/workspace' /etc/fstab; then
+			echo "Warning: you need to manually create a /srv/workspace partition on OSUOSL nodes, exiting."
+			exit 1
+		fi
+		;;
+	jenkins|ionos*amd64|codethink*)
 		if ! grep -q '^tmpfs\s\+/srv/workspace\s' /etc/fstab; then
 			echo "tmpfs		/srv/workspace	tmpfs	defaults,size=${TMPFSSIZE}g	0	0" | sudo tee -a /etc/fstab >/dev/null  
 		fi



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/988d3ac3fd42f698654296f350d009e7cb57d585
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/20230403/87bbbdfc/attachment-0001.htm>