[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: only keep diffoscope html output (=no json + no txt) for...
Holger Levsen (@holger)
gitlab at salsa.debian.org
Thu Jan 5 14:53:01 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
098742fb by Holger Levsen at 2023-01-05T15:52:49+01:00
reproducible Debian: only keep diffoscope html output (=no json + no txt) for LTS suites and older to save diskspace on jenkins host
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1 changed file:
- bin/reproducible_build.sh
Changes:
=====================================
bin/reproducible_build.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2014-2022 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2023 Holger Levsen <holger at layer-acht.org>
# © 2015-2018 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv2
@@ -372,6 +372,14 @@ call_diffoscope_on_changes_files() {
# this --timeout 120m below is arbitrary and can be subject to further evaluation later
DIFFOSCOPE_TIMEOUT="--timeout $(( 120 * 60 ))"
fi
+ # for older suites we only keep diffoscope html output, which saves us >70GB diskspace...
+ case "$SUITE" in
+ # add bullseye here once it becomes LTS and also update this comment then
+ stretch|buster) DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT}"
+ ;;
+ *) DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT} --text $TMPDIR/$DBDTXT --json $TMPDIR/$DBDJSON"
+ ;;
+ esac
set -x
set +e
( timeout 155m nice schroot \
@@ -380,9 +388,7 @@ call_diffoscope_on_changes_files() {
-c "$session" \
-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
${DIFFOSCOPE_TIMEOUT-} \
- --html $TMPDIR/${DBDREPORT} \
- --text $TMPDIR/$DBDTXT \
- --json $TMPDIR/$DBDJSON \
+ ${DIFFOSCOPE_OUTPUT} \
--profile=- \
$TMPDIR/b1/${CHANGES} \
$TMPDIR/b2/${CHANGES}" \
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/098742fb816b7f8c8533602e93f56ebc81fb23dd
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/098742fb816b7f8c8533602e93f56ebc81fb23dd
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/20230105/fda7d8c9/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list