[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible_debian_live_build: Use unique folders for the artifacts of each Debian version
Holger Levsen (@holger)
gitlab at salsa.debian.org
Sat Jan 22 15:24:42 GMT 2022
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
8a1db551 by Roland Clobus at 2022-01-22T16:24:07+01:00
reproducible_debian_live_build: Use unique folders for the artifacts of each Debian version
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
=====================================
@@ -83,7 +83,7 @@ fi
delay_start
# Cleanup possible artifacts of a previous build (see reproducible_common.sh for the path)
-rm -rf $BASE/debian_live_build/artifacts/r00t-me/${CONFIGURATION}_tmp-*
+rm -rf $BASE/debian_live_build/artifacts/r00t-me/${CONFIGURATION}-${DEBIAN_VERSION}_tmp-*
# Generate and use an isolated workspace
export PROJECTNAME="live-build"
@@ -426,12 +426,12 @@ PAGE=${CONFIGURATION}-${DEBIAN_VERSION}.html
if [ -f "${RESULTSDIR}/${PROJECTNAME}/${CONFIGURATION}/live-image-amd64.hybrid.iso.html" ] ; then
# Publish the output of diffoscope, there are differences
cp -a ${RESULTSDIR}/${PROJECTNAME}/${CONFIGURATION}/live-image-amd64.hybrid.iso.html ${PAGE}
- save_artifacts debian_live_build ${CONFIGURATION} https://wiki.debian.org/ReproducibleInstalls/LiveImages
+ save_artifacts debian_live_build ${CONFIGURATION}-${DEBIAN_VERSION} https://wiki.debian.org/ReproducibleInstalls/LiveImages
output_echo "Warning: diffoscope detected differences in the images"
else
if [ "$RESULT" != "0" ] ; then
echo "${DIFFOSCOPE} for ${PROJECTNAME} in configuration ${CONFIGURATION} with timestamp ${SOURCE_DATE_EPOCH} (${SNAPSHOT_TIMESTAMP}) returned error code ${RESULT}" > ${PAGE}
- save_artifacts debian_live_build ${CONFIGURATION} https://wiki.debian.org/ReproducibleInstalls/LiveImages
+ save_artifacts debian_live_build ${CONFIGURATION}-${DEBIAN_VERSION} https://wiki.debian.org/ReproducibleInstalls/LiveImages
output_echo "Warning: diffoscope returned error code {$RESULT}"
else
echo "${PROJECTNAME} in configuration ${CONFIGURATION} with timestamp ${SOURCE_DATE_EPOCH} (${SNAPSHOT_TIMESTAMP}) is reproducible" > ${PAGE}
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8a1db55150a863121a66ad5a5437e96497cad151
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8a1db55150a863121a66ad5a5437e96497cad151
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/20220122/8d34e8a5/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list