[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian real-world: minor tweaks

[Holger Levsen]

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


Commits:
1233a765 by Holger Levsen at 2019-02-22T13:41:59Z
reproducible Debian real-world: minor tweaks

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

- - - - -
e656cf54 by Holger Levsen at 2019-02-22T14:08:06Z
reproducible Debian real-world: drop now obsolete code

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
=====================================
@@ -32,6 +32,7 @@ set -e
 #   - use same debuild options possible? or try all sane options?
 #   - submit .buildinfo file to b.d.n and then fetch the json again.
 #   - debootstrap stretch and upgrade from there?
+# - this is all amd64 only for a start
 
 RELEASE=buster
 MODE="$1"
@@ -60,8 +61,7 @@ case "$MODE" in
 	random)		SORT="sort -R";;
 	reverse)	SORT="sort -r" ;;
 	forward)	SORT="sort" ;;
-	*)		SORT="sort" ; MODE="results" ; RESULTS=$(mktemp --tmpdir=$TMPDIR sha1-results-XXXXXXX) ; find $SHA1DIR -name "*REPRODUCIBLE.buster" > $RESULTS
-			JSONS=$(mktemp --tmpdir=$TMPDIR sha1-results-XXXXXXX) ; find $SHA1DIR -name "*.json" > $JSONS ;;
+	*)		SORT="sort" ; MODE="results" ; RESULTS=$(mktemp --tmpdir=$TMPDIR sha1-results-XXXXXXX) ; find $SHA1DIR -name "*REPRODUCIBLE.buster" > $RESULTS ;;
 esac
 packages="$(grep ^Package: $PACKAGES| awk '{print $2}' | $SORT | xargs echo)"
 
@@ -94,7 +94,7 @@ cleanup_all() {
 		echo
 		percent_repro=$(echo "scale=4 ; $reproducible_count / ($reproducible_count+$unreproducible_count) * 100" | bc)
 		percent_unrepro=$(echo "scale=4 ; $unreproducible_count / ($reproducible_count+$unreproducible_count) * 100" | bc)
-		echo "Statistics of packages in known state only"
+		echo "Statistics of packages in known states only"
 		echo "-------------------------------------------------------------"
 		echo "reproducible packages in $RELEASE/amd64: $reproducible_count: ($percent_repro%)"
 		echo "unreproducible packages in $RELEASE/amd64: $unreproducible_count: ($percent_unrepro%)"
@@ -102,7 +102,7 @@ cleanup_all() {
 		echo
 		echo "$(du -sch $SHA1DIR)"
 		echo
-		rm $RESULTS $JSONS
+		rm $RESULTS
 	fi
 	rm $log $PACKAGES
 }
@@ -133,20 +133,6 @@ if [ "$MODE" = "results" ] ; then
 			fi
 			continue
 		fi
-		json=$(grep "/${package}_" $JSONS || true)
-		if [ -n "$json" ] ; then
-			package_file=$(echo $json | sed 's#\.deb\.json$#.deb#' )
-			count=$(fmt ${package_file}.json | grep -c '\.buildinfo' || true)
-			SHA1SUM_PKG="$(cat ${package_file}.sha1output | awk '{print $1}' )"
-			if [ "${count}" -ge 2 ]; then
-				echo $count > ${package_file}.REPRODUCIBLE.$RELEASE
-				echo "$(date -u) - REPRODUCIBLE: $package_file ($SHA1SUM_PKG) - reproduced $count times."
-			else
-				echo 1 > ${package_file}.UNREPRODUCIBLE.$RELEASE
-				echo "$(date -u) - UNREPRODUCIBLE: $package_file ($SHA1SUM_PKG) only on ftp.debian.org."
-			fi
-			continue
-		fi
 		echo "$(date -u) - UNKNOWN: $package"
 	done | tee $log
 	exit



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/9b6fd8e759c2739e0199a42cba75bb13b006700b...e656cf549293cef9272c706284de68bc7ce526d5

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/9b6fd8e759c2739e0199a42cba75bb13b006700b...e656cf549293cef9272c706284de68bc7ce526d5
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/20190222/98d121f6/attachment-0001.html>