[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian maintenance: avoid hardcoding testing=bookworm

[Holger Levsen (@holger)]

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


Commits:
38db877c by Holger Levsen at 2022-09-18T22:38:15+02:00
reproducible Debian maintenance: avoid hardcoding testing=bookworm

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

- - - - -


3 changed files:

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


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -483,8 +483,12 @@ cleanup_old_schroots() {
 	fi
 }
 cleanup_old_schroots "schroots" 31 "/schroots/(reproducible-.+-[0-9]{1,5}|schroot-install-.+)"
-# FIXME: find a way to not forget this for the bookworm release, when trixie will become the development version
-cleanup_old_schroots "unstable and bookworm schroots" 5 "/schroots/reproducible-(unstable|bookworm)-diffoscope-.+-[0-9]{1,5}"
+if [ -f /etc/debian_testing ] ; then
+	TESTING=$(cat /etc/debian_testing)
+else
+	TESTING=bookworm
+fi
+cleanup_old_schroots "unstable and $TESTING schroots" 5 "/schroots/reproducible-(unstable|$TESTING)-diffoscope-.+-[0-9]{1,5}"
 
 # find very old schroots
 echo "$(date -u) - Detecting schroots older than 1 month"


=====================================
hosts/common/etc/rc.local
=====================================
@@ -8,6 +8,11 @@
 
 set -x
 
+#
+# /etc/rc.local runs at boot time, so we do some stuff and then we send *some*
+# hosts back to the future for reproducibility testing. the others just run today.
+#
+
 send_back_to_the_future() {
 	# stop ntp
 	service ntp stop || true
@@ -89,6 +94,11 @@ if [ "$(hostname)" = "jenkins" ] ; then
 	done
 fi
 
+#
+# document what is "Debian testing" today (because distro-info doesn't like to be run in the future... :)
+#
+distro-info --testing > /etc/debian_testing
+
 #
 # run some hosts in the future
 #


=====================================
update_jdn.sh
=====================================
@@ -307,6 +307,7 @@ if [ -f /etc/debian_version ] ; then
 			bsd-mailx
 			curl
 			debian-archive-keyring
+			distro-info
 			dstat
 			cdebootstrap-
 			debootstrap
@@ -382,8 +383,7 @@ if [ -f /etc/debian_version ] ; then
 			# needed for rebuilding Debian (using .buildinfo files)
 			osuosl173-amd64) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild" 
 					 DEBS="$DEBS live-build"	# needed for live-build
-					 DEBS="$DEBS cdebootstrap"  	# needed for testing just that
-					 DEBS="$DEBS distro-info" ;;	# needed for setting S_D_E to a 'good' value
+					 DEBS="$DEBS cdebootstrap" ;; 	# needed for testing just that
 			# needed for opensuse openbuildservice
 			osuosl174-amd64) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
 			*) ;;



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/38db877cbc671048803ba4dd1bd244c1d3c4fba0
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/20220918/910ca6c6/attachment-0001.htm>