[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Create a subdirectory for the ISO files, add more logging to the diffoscope...

[Holger Levsen (@holger)]

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


Commits:
1966e740 by Roland Clobus at 2021-06-24T11:33:42+02:00
Create a subdirectory for the ISO files, add more logging to the diffoscope call and publish the output of diffoscope

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

- - - - -


1 changed file:

- bin/reproducible_debian_live_build.sh


Changes:

=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -35,8 +35,9 @@ trap cleanup INT TERM EXIT
 
 # Generate and use an isolated workspace
 export PROJECTNAME="live-build"
+export CONFIGURATION="smallest-build"
 mkdir -p /srv/workspace/live-build
-export TMPDIR=$(mktemp --tmpdir=/srv/workspace/live-build -d -t smallest-build.XXXXXXXX)
+export TMPDIR=$(mktemp --tmpdir=/srv/workspace/live-build -d -t ${CONFIGURATION}.XXXXXXXX)
 cd ${TMPDIR}
 
 # Fetch and use the latest version of live build
@@ -218,8 +219,8 @@ if [ "$RESULT" != "0" ] ; then
 fi
 
 # Move the image away
-mkdir -p ${TMPDIR}/b1/${PROJECTNAME}
-mv live-image-amd64.hybrid.iso ${TMPDIR}/b1/${PROJECTNAME}
+mkdir -p ${TMPDIR}/b1/${PROJECTNAME}/${CONFIGURATION}
+mv live-image-amd64.hybrid.iso ${TMPDIR}/b1/${PROJECTNAME}/${CONFIGURATION}
 
 # Clean for the second build
 sudo lb clean --purge | tee -a $LB_OUTPUT
@@ -239,8 +240,8 @@ if [ "$RESULT" != "0" ] ; then
 fi
 
 # Move the image away
-mkdir -p ${TMPDIR}/b2/${PROJECTNAME}
-mv live-image-amd64.hybrid.iso ${TMPDIR}/b2/${PROJECTNAME}
+mkdir -p ${TMPDIR}/b2/${PROJECTNAME}/${CONFIGURATION}
+mv live-image-amd64.hybrid.iso ${TMPDIR}/b2/${PROJECTNAME}/${CONFIGURATION}
 
 # Clean up
 sudo lb clean --purge | tee -a $LB_OUTPUT
@@ -255,10 +256,19 @@ cd ..
 # Compare the images
 TIMEOUT="30m"
 DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
-call_diffoscope ${PROJECTNAME} live-image-amd64.hybrid.iso
+call_diffoscope ${PROJECTNAME} ${CONFIGURATION}/live-image-amd64.hybrid.iso
+if [ ! -f "${TMPDIR}/${PROJECTNAME}/${CONFIGURATION}/live-image-amd64.hybrid.iso.html" ] ; then
+   output_echo "Error: diffoscope failed, no output available"
+fi
+# Publish the output of diffoscope
+PAGE=live-image-amd64.hybrid.iso.html
+cp -a ${TMPDIR}/${PROJECTNAME}/${CONFIGURATION}/live-image-amd64.hybrid.iso.html ${PAGE}
+publish_page debian_live_build
 
 cleanup success
 # Turn off the trap
 trap - INT TERM EXIT
 
-output_echo "the end."
+output_echo "the end, diffoscope has returned ${RESULT}."
+# Return with the status of diffoscope
+exit ${RESULT}



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1966e7407f15bb66f61a942466f6ceee1b5697f1
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/20210624/043cac05/attachment-0001.htm>