[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: refactoring

[Holger Levsen (@holger)]

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


Commits:
3ffc6568 by Holger Levsen at 2022-08-29T22:16:24+02:00
reproducible Debian: refactoring

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

- - - - -


1 changed file:

- bin/reproducible_debstrap.sh


Changes:

=====================================
bin/reproducible_debstrap.sh
=====================================
@@ -30,10 +30,11 @@ cleanup() {
 cleanup_unreproducible_file(){
 	local TYPE=$1
 	local FILE=$2
-	if [ -f $FILE ] ; then
-		output_echo "Warning: modifying $TOOL result, deleting $TYPE $FILE"
+	if sudo file -E $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE >/dev/null 2>&1 ; then
+		output_echo "Warning: modifying $TOOL result, deleting unreproducible $TYPE $FILE"
 		sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
 	else
+		sudo file $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
 		output_echo "Warning: shall remove $FILE but it does not exist. Maybe $TOOL was improved."
 	fi
 }
@@ -77,19 +78,18 @@ for LOOP in "first" "second" ; do
 		debootstrap|cdebootstrap)
 				sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
 				# work around unreproducible artifacts
+				BAD_FILES="/etc/machine-id /var/cache/ldconfig/aux-cache"
 				case ${TOOL} in
-					debootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log"
-							BAD_FILES="/etc/machine-id /var/cache/ldconfig/aux-cache"
+					debootstrap)	BAD_LOGFILES="/var/log/dpkg.log /var/log/alternatives.log /var/log/bootstrap.log"
 							;;
-					cdebootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log /var/log/apt/history.log /var/log/apt/term.log"
-							BAD_FILES="/etc/machine-id"
+					cdebootstrap)	BAD_LOGFILES="/var/log/dpkg.log /var/log/alternatives.log /var/log/bootstrap.log /var/log/apt/history.log /var/log/apt/term.log"
 							;;
 				esac
-				for FILE in $BAD_LOGFILES ; do
-					cleanup_unreproducible_file "unreproducible logfile" $FILE
+				for i in $BAD_LOGFILES ; do
+					cleanup_unreproducible_file logfile "$i"
 				done
-				for FILE in $BAD_FILES ; do
-					cleanup_unreproducible_file "unreproducible file" $FILE
+				for i in $BAD_FILES ; do
+					cleanup_unreproducible_file file "$i"
 				done
 				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
 				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/3ffc65685cc7d9b87fd18652bf55ee726b142ec8
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/20220829/4aced0fc/attachment-0001.htm>