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

[Holger Levsen]

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


Commits:
e56d71b0 by Holger Levsen at 2019-02-20T12:12:25Z
reproducible Debian: refactor

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

- - - - -
781158ea by Holger Levsen at 2019-02-20T12:13:29Z
reproducible Debian: include (too many) timestamps for debugging

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

- - - - -


1 changed file:

- bin/reproducible_compare_Debian_sha1sums.sh


Changes:

=====================================
bin/reproducible_compare_Debian_sha1sums.sh
=====================================
@@ -72,30 +72,33 @@ cleanup_all() {
 trap cleanup_all INT TERM EXIT
 
 for package in $packages ; do
+	date -u
 	schroot --directory  $SHA1DIR -c chroot:jenkins-reproducible-unstable-diffoscope apt-get download ${package} || continue
+	date -u
 	if [ $(ls -1 ${package}_*.deb | wc -l) -ne 1 ] ; then
 		DEB="$(ls -1 ${package}_*.deb | heads -1)"
 		echo "deleting $DEB..."
 		rm $DEB # first I thought to delete $DEB* but only deleting $DEB is better
 	fi
 	package_file=$(ls ${package}_*.deb)
+	date -u
 	if [ ! -e ${package_file}.sha1output ] ; then
 		SHA1SUM_OUTPUT="$(sha1sum ${package}_*.deb | tee ${package_file}.sha1output)"
 	else
 		SHA1SUM_OUTPUT="$(cat ${package_file}.sha1output)"
 	fi
 	SHA1SUM_PKG="$(echo $SHA1SUM_OUTPUT | awk '{print $1}' 2>/dev/null)"
-	echo "$SHA1SUM_OUTPUT" | while read checksum package_file ; do
-		if [ ! -e ${package_file}.json ]; then
-			wget --quiet -O ${package_file}.json ${bdn_url}/${checksum}
-		fi
-		count=$(fmt ${package_file}.json | grep '\.buildinfo' | wc -l)
-		if [ "${count}" -ge 2 ]; then
-			echo "REPRODUCIBLE: $package_file: $SHA1SUM_PKG - reproduced $count times."
-		else
-			echo "UNREPRODUCIBLE: $package_file: $SHA1SUM_PKG on ftp.debian.org, but nowhere else."
-		fi
-	done
+	date -u
+	if [ ! -e ${package_file}.json ]; then
+		wget --quiet -O ${package_file}.json ${bdn_url}/${checksum}
+	fi
+	date -u
+	count=$(fmt ${package_file}.json | grep '\.buildinfo' | wc -l)
+	if [ "${count}" -ge 2 ]; then
+		echo "REPRODUCIBLE: $package_file: $SHA1SUM_PKG - reproduced $count times."
+	else
+		echo "UNREPRODUCIBLE: $package_file: $SHA1SUM_PKG on ftp.debian.org, but nowhere else."
+	fi
 done | tee $log
 
 cleanup_all



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/07ae74c550b329355f460f07ffe696d27ab62a56...781158eacf6afd751f6454fdfcde524fd7d79f39

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/07ae74c550b329355f460f07ffe696d27ab62a56...781158eacf6afd751f6454fdfcde524fd7d79f39
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/20190220/43722dd6/attachment-0001.html>