[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: debstrap jobs: ignore expected diffoscope failure and disable debug output

[Holger Levsen (@holger)]

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


Commits:
5e8e276f by Holger Levsen at 2022-08-29T20:17:56+02:00
reproducible Debian: debstrap jobs: ignore expected diffoscope failure and disable debug output

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

- - - - -
955cc9ba by Holger Levsen at 2022-08-29T20:21:08+02:00
reproducible Debian: work around debootstrap keeping logfiles in its artifacts

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

- - - - -


1 changed file:

- bin/reproducible_debstrap.sh


Changes:

=====================================
bin/reproducible_debstrap.sh
=====================================
@@ -4,7 +4,7 @@
 # Copyright 2021-2022 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv2
 
-DEBUG=true
+DEBUG=false
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
@@ -19,7 +19,7 @@ cleanup() {
 	# Cleanup the workspace and results directory
 	for CLEANUP in ${BUILDDIR} ${RESULTSDIR} ; do
 		if [ ! -z "$CLEANUP" ]; then
-			echo sudo rm -rf --one-file-system ${CLEANUP}
+			sudo rm -rf --one-file-system ${CLEANUP}
 		fi
 	done
 }
@@ -61,10 +61,14 @@ for LOOP in "first" "second" ; do
 		mmdebstrap)	sudo $REALTOOL $SUITE > $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar
 				;;
 		debootstrap)	sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
+				for i in /var/log/alternatives.log ; do
+					output_echo "Warning: modifying $TOOL result, deleting unreproducible logfile $LOGFILE"
+					sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/var/log/alternatives.log
+				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}
 				;;
-		*)		echo "Failure: ${TOOL} is unsupported."
+		*)		output_echo "Failure: ${TOOL} is unsupported."
 				exit 1
 				;;
 	esac
@@ -88,7 +92,7 @@ else
 	TMPDIR=${RESULTSDIR}
 	#call_diffoscope ${TOOL} ${SUITE}.tar
 	# the previous, temporarily disabled line is only useful if we also make the .html file visible...
-	schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --restructured-text $RESULTSDIR/${TOOL}_${SUITE}.txt $RESULTSDIR/b1/${TOOL}/${SUITE}.tar $RESULTSDIR/b2/${TOOL}/${SUITE}.tar
+	schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --restructured-text $RESULTSDIR/${TOOL}_${SUITE}.txt $RESULTSDIR/b1/${TOOL}/${SUITE}.tar $RESULTSDIR/b2/${TOOL}/${SUITE}.tar || true # diffoscope will exi with error...
 	cat $RESULTSDIR/${TOOL}_${SUITE}.txt
 fi
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/22cd970af27e070d59824c5dfc2672ead1d020e3...955cc9baefabaabf00ecbd3642b1365e8fd44290

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/22cd970af27e070d59824c5dfc2672ead1d020e3...955cc9baefabaabf00ecbd3642b1365e8fd44290
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/028a6148/attachment-0001.htm>