[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: mmdebstrap job: make results accessable to call_diffoscope()

[Holger Levsen (@holger)]

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


Commits:
4c7c909d by Holger Levsen at 2022-08-26T21:18:28+02:00
reproducible Debian: mmdebstrap job: make results accessable to call_diffoscope()

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

- - - - -


2 changed files:

- bin/jenkins_node_wrapper.sh
- bin/reproducible_mmdebstrap.sh


Changes:

=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -86,7 +86,7 @@ elif [ "$1" = "reproducible_pool_buildinfos" ] ; then
 	exec /srv/jenkins/bin/reproducible_pool_buildinfos.sh ; croak "Exec failed";
 elif [ "$1" = "reproducible_html_builtin-pho" ] ; then
 	exec /srv/jenkins/bin/reproducible_html_builtin-pho.sh ; croak "Exec failed";
-elif [ "$1" = "reproducible_mmdebstrap.*" ] ; then
+elif [[ "$*" =~ reproducible_mmdebstrap.* ]] ; then
 	exec /srv/jenkins/bin/reproducible_mmdebstrap.sh "$2" ; croak "Exec failed";
 elif [ "$1" = "janitor-setup-worker" ] ; then
 	shift ; exec /srv/jenkins/bin/janitor_setup_worker.sh ; croak "Exec failed";


=====================================
bin/reproducible_mmdebstrap.sh
=====================================
@@ -27,6 +27,7 @@ cleanup() {
 export SUITE="$1"
 export SOURCE_DATE_EPOCH="$(date +%s)"
 export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t mmdebstrap-${SUITE}.XXXXXXXX)
+export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t mmdebstrap-${SUITE}.XXXXXXXX) # accessible in schroots, used to compare results
 
 # Cleanup if something goes wrong
 trap cleanup INT TERM EXIT
@@ -43,11 +44,13 @@ 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
 
+mv $BUILDDIR/b1 $BUILDDIR/b2 $RESULTSDIR/
+
 # 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=${BUILDDIR}
+TMPDIR=${RESULTSDIR}
 call_diffoscope mmdebstrap ${SUITE}.tar
 
 cleanup success



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

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