[Git][qa/jenkins.debian.net][master] 2 commits: reproducible_freebsd.sh: Update cleanup_tmpdirs to match other rm

[Holger Levsen (@holger)]

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


Commits:
259366b4 by Jessica Clarke at 2025-01-28T20:04:24+01:00
reproducible_freebsd.sh: Update cleanup_tmpdirs to match other rm

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

- - - - -
9741a36b by Jessica Clarke at 2025-01-28T20:04:28+01:00
reproducible_freebsd.sh: Make sure /usr/obj/usr/src is accessible

Also update sudoers to match.

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

- - - - -


2 changed files:

- bin/reproducible_freebsd.sh
- hosts/freebsd-jenkins/usr/local/etc/sudoers


Changes:

=====================================
bin/reproducible_freebsd.sh
=====================================
@@ -16,7 +16,7 @@ cleanup_tmpdirs() {
 	$RSSH "sudo chflags -R noschg $TMPDIR"
 	$RSSH "rm -r $TMPDIR" || true
 	rm $TMPDIR -r
-	$RSSH 'sudo rm -rf /usr/src'
+	$RSSH 'sudo rm -rf /usr/src /usr/obj/usr/src'
 }
 
 create_results_dirs() {
@@ -98,7 +98,7 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
 	RSSH="ssh -o Batchmode=yes freebsd-jenkins.debian.net"
 	RSCP="scp -r freebsd-jenkins.debian.net"
 	TMPBUILDDIR=/usr/src
-	$RSSH 'sudo rm -rf /usr/src /usr/obj/usr/src ; sudo mkdir /usr/src ; sudo chown jenkins /usr/src'  ### this is tmpfs on linux, we should move this to tmpfs on FreeBSD too
+	$RSSH 'sudo rm -rf /usr/src /usr/obj/usr/src ; sudo mkdir -p /usr/obj/usr/src ; sudo mkdir /usr/src ; sudo chown jenkins /usr/src /usr/obj/usr/src'  ### this is tmpfs on linux, we should move this to tmpfs on FreeBSD too
 	# Ensure we start with the correct time on the target
 	$RSSH 'sudo service ntpd stop ; sudo ntpdate -b pool.ntp.org ; sudo service ntpd start'
 	$RSSH 'sudo service ntpd status ; date -u'


=====================================
hosts/freebsd-jenkins/usr/local/etc/sudoers
=====================================
@@ -106,7 +106,8 @@ jenkins ALL= NOPASSWD: /usr/bin/make -j * buildworld, \
 	/bin/rm -r /srv/reproducible-results/* /srv/reproducible-results/*.tar.xz, \
 	/bin/chflags -R noschg /srv/reproducible-results/*, \
 	/bin/mkdir /usr/src, \
-	/usr/sbin/chown jenkins /usr/src, \
+	/bin/mkdir -p /usr/obj/usr/src, \
+	/usr/sbin/chown jenkins /usr/src /usr/obj/usr/src, \
 	/usr/bin/find /srv/reproducible-results/* -newer /srv/reproducible-results/* -exec touch *, \
 	/usr/bin/find /srv/reproducible-results/* -print0, \
 	/usr/bin/tar --no-recursion --null -T - -cJf *.tar.xz, \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f0497b83ac83127c9ee18547d45807eb0a28bc02...9741a36b062c729f025dd6763354e6159455f93c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f0497b83ac83127c9ee18547d45807eb0a28bc02...9741a36b062c729f025dd6763354e6159455f93c
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/20250128/6e896408/attachment-0001.htm>