[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: announce progress to ease debugging

[Holger Levsen (@holger)]

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


Commits:
89881d0c by Holger Levsen at 2021-09-30T19:58:56+02:00
reproducible Debian: announce progress to ease debugging

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
=====================================
@@ -22,6 +22,7 @@ output_echo() {
 }
 
 cleanup() {
+   output_echo Cleanup $1
    # Cleanup the workspace
    if [ ! -z "${BUILDDIR}" ] ; then
       sudo rm -rf --one-file-system ${BUILDDIR}
@@ -110,6 +111,7 @@ output_echo "Info: using the snapshot from ${SOURCE_DATE_EPOCH} (${SNAPSHOT_TIME
 # - No installer
 # - Don't cache the downloaded content, re-download for the second build
 # - Explicitly use the proxy that is set by ${http_proxy} to reduce some network traffic
+output_echo "Running lb config for the 1st build"
 lb config \
 	--parent-mirror-bootstrap ${MIRROR} \
 	--parent-mirror-binary ${MIRROR} \
@@ -303,6 +305,7 @@ rm -f /var/lib/ucf/registry.*
 EOF
 
 # First build
+output_echo "Running lb build for the 1st build"
 sudo lb build | tee -a $LB_OUTPUT
 RESULT=$?
 if [ "$RESULT" != "0" ] ; then
@@ -314,6 +317,7 @@ mkdir -p ${RESULTSDIR}/b1/${PROJECTNAME}/${CONFIGURATION}
 mv live-image-amd64.hybrid.iso ${RESULTSDIR}/b1/${PROJECTNAME}/${CONFIGURATION}
 
 # Clean for the second build
+output_echo "Running lb clean after the 1st build"
 sudo lb clean --purge | tee -a $LB_OUTPUT
 RESULT=$?
 if [ "$RESULT" != "0" ] ; then
@@ -321,9 +325,11 @@ if [ "$RESULT" != "0" ] ; then
 fi
 
 # Re-activate the previous configuration
+output_echo "Running lb config for the 2nd build"
 lb config
 
 # Second build
+output_echo "Running lb build for the 2nd build"
 sudo lb build | tee -a $LB_OUTPUT
 RESULT=$?
 if [ "$RESULT" != "0" ] ; then
@@ -335,6 +341,7 @@ mkdir -p ${RESULTSDIR}/b2/${PROJECTNAME}/${CONFIGURATION}
 mv live-image-amd64.hybrid.iso ${RESULTSDIR}/b2/${PROJECTNAME}/${CONFIGURATION}
 
 # Clean up
+output_echo "Running lb clean after the 2nd build"
 sudo lb clean --purge | tee -a $LB_OUTPUT
 RESULT=$?
 if [ "$RESULT" != "0" ] ; then
@@ -345,6 +352,7 @@ fi
 cd ..
 
 # Compare 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}
@@ -366,6 +374,7 @@ else
       output_echo "Info: no differences found"
    fi
 fi
+output_echo "Publishing results"
 publish_page debian_live_build
 
 cleanup success



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/89881d0c496a92aa75c5386cd63b0dead829a072
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/20210930/ea609e39/attachment-0001.htm>