[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: mmdebstrap job: show results in a more human friendly way

[Holger Levsen (@holger)]

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


Commits:
90270e30 by Holger Levsen at 2022-08-26T21:26:33+02:00
reproducible Debian: mmdebstrap job: show results in a more human friendly way

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

- - - - -
708c500b by Holger Levsen at 2022-08-26T21:27:53+02:00
reproducible Debian: mmdebstrap jobs: also add jobs for bullseye and bookworm

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

- - - - -


2 changed files:

- bin/reproducible_mmdebstrap.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_mmdebstrap.sh
=====================================
@@ -44,17 +44,24 @@ sudo mmdebstrap $SUITE > $BUILDDIR/b1/mmdebstrap/${SUITE}.tar
 output_echo "Running mmdebstrap $SUITE for the second run."
 sudo mmdebstrap $SUITE > $BUILDDIR/b2/mmdebstrap/${SUITE}.tar
 
+# show sha256sum results
 mv $BUILDDIR/b1 $BUILDDIR/b2 $RESULTSDIR/
+sha256sum $RESULTSDIR/b1/mmdebstrap/${SUITE}.tar $RESULTSDIR/b2/mmdebstrap/${SUITE}.tar
 
-# Run diffoscope on the images
-output_echo "Calling diffoscope on the results."
-TIMEOUT="240m"
-DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
-TMPDIR=${RESULTSDIR}
-call_diffoscope mmdebstrap ${SUITE}.tar
+# show human readable results
+if diff $RESULTSDIR/b1/mmdebstrap/${SUITE}.tar RESULTSDIR/b2/mmdebstrap/${SUITE}.tar ; then
+	echo "Success: mmdebstrap of $SUITE is reproducible today."
+else
+	echo "Warning: mmdebstrap of $SUITE is not reproducible."
+	# Run diffoscope on the images
+	output_echo "Calling diffoscope on the results."
+	TIMEOUT="240m"
+	DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
+	TMPDIR=${RESULTSDIR}
+	call_diffoscope mmdebstrap ${SUITE}.tar
+fi
 
 cleanup success
-
 # Turn off the trap
 trap - INT TERM EXIT
 


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -609,6 +609,16 @@
                     my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh unstable'
                     my_timed: '0 7 * * *'
                     my_hname: 'osuosl173'
+                - 'mmdebstrap_bookworm':
+                    my_description: 'Check mmdebstrap of bookworm is reproducible.'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bookworm'
+                    my_timed: '0 7 * * *'
+                    my_hname: 'osuosl173'
+                - 'mmdebstrap_bullseye':
+                    my_description: 'Check mmdebstrap of bullseye is reproducible.'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bullseye'
+                    my_timed: '0 7 * * *'
+                    my_hname: 'osuosl173'
                 - 'json':
                     my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json for consumption by tracker.debian.org.'
                     my_timed: '1 H/2 * * *'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4c7c909d8b479d902f795d2ef2025bd55737108f...708c500beede985b36bf6c0a7632c4293b315c58

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4c7c909d8b479d902f795d2ef2025bd55737108f...708c500beede985b36bf6c0a7632c4293b315c58
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/20220826/08c3236b/attachment-0001.htm>