reproducible Debian: refactoring

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

bin/reproducible_debstrap.sh

@@ -49,9 +49,6 @@ if [ "$SUITE" != "unstable" ] ; then
 else
 	CODENAME=sid
 fi
-S_D_E_DATE="$(grep $CODENAME /usr/share/distro-info/debian.csv | awk  -F',' '{print $4}')"
-export SOURCE_DATE_EPOCH="$(date +%s -d $S_D_E_DATE)"
-output_echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH that is $S_D_E_DATE which is when $SUITE was created."
 
 export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t ${TOOL}-${SUITE}.XXXXXXXX)
 export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t ${TOOL}-${SUITE}.XXXXXXXX) # accessible in schroots, used to compare results
@@ -62,6 +59,11 @@ trap cleanup INT TERM EXIT
 # Randomize start time
 delay_start
 
+# SOURCE_DATE_EPOCH needs to be set to allow clamping file timestamps newer than this.
+S_D_E_DATE="$(grep $CODENAME /usr/share/distro-info/debian.csv | awk  -F',' '{print $4}')"
+export SOURCE_DATE_EPOCH="$(date +%s -d $S_D_E_DATE)"
+output_echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH that is $S_D_E_DATE which is when $SUITE was created."
+
 # Actual run ${TOOL} twice
 for LOOP in "first" "second" ; do
 	case $LOOP in

bin/reproducible_html_nodes_info.sh

@@ -254,8 +254,12 @@ build_job_health_page() {
 		"html_(all|break|dash|dd|index|live|node|pkg|repo)"
 		"(reproducible_compare|pool)"
 		"reproducible_diffoscope"
-		"reproducible_(cdeboot|deboot|mmdeb)strap"
-		"reproducible_debian_live_build"
+		"reproducible_mmdebstrap"
+		"reproducible_debootstrap"
+		"reproducible_cdebootstrap"
+		"reproducible_debian_live_build.*bullseye"
+		"reproducible_debian_live_build.*bookworm"
+		"reproducible_debian_live_build.*sid"
 		"(reprotest|strip-nonderminism|disorderfs)"
 		"(json|le_scheduler|meta|le_nodes|rsync|notes)"
 		"archlinux"
@@ -288,6 +292,7 @@ build_job_health_page() {
 				| sed 's#builds_##' \
 				| sed 's#_diffoscope_amd64##' \
 				| sed 's#compare_Debian_##' \
+				| sed 's#debian_live_build#live#' \
 				| sed 's#_#-#g' \
 				)"
 			write_page "<th>$SHORTNAME</th>"