[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: use task related temp dir names (needs maintenance job adjustments too)

[Holger Levsen (@holger)]

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


Commits:
7ed09046 by Holger Levsen at 2022-10-23T00:02:33+02:00
reproducible Debian: use task related temp dir names (needs maintenance job adjustments too)

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

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -337,7 +337,7 @@ call_diffoscope_on_changes_files() {
 	# DIFFOSCOPE is globally used
 	# filter lines describing .buildinfo files from .changes file
 	sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
-	TMPLOG=$(mktemp --tmpdir=$TMPDIR)
+	TMPLOG=$(mktemp --tmpdir=$TMPDIR diffoscope-templog.XXXXXXXX)
 	TIMEOUT="150m"  # note that below there is another instance of this + 5 minutes
 	DBDSUITE=$SUITE
 	if [ "$SUITE" = "experimental" ] ; then
@@ -442,7 +442,7 @@ choose_package() {
 	NOTIFY_MAINTAINER=$(echo $RESULT|cut -d "|" -f7)
 	# remove previous build attempts which didnt finish correctly:
 	JOB_PREFIX="${JOB_NAME#reproducible_builder_}/"
-	BAD_BUILDS=$(mktemp --tmpdir=$TMPDIR)
+	BAD_BUILDS=$(mktemp --tmpdir=$TMPDIR badbuilds.XXXXXXXX)
 	query_db "SELECT package_id, date_build_started, job FROM schedule WHERE job LIKE '${JOB_PREFIX}%'" > $BAD_BUILDS
 	if [ -s "$BAD_BUILDS" ] ; then
 		local STALELOG=/var/log/jenkins/reproducible-stale-builds.log
@@ -499,7 +499,7 @@ choose_package() {
 download_source() {
 	log_info "Downloading source for ${SUITE}/${SRCPACKAGE}=${VERSION}"
 	set +e
-	local TMPLOG=$(mktemp --tmpdir=$TMPDIR)
+	local TMPLOG=$(mktemp --tmpdir=$TMPDIR download-source.XXXXXXXX)
 	if [ "$MODE" != "master" ] ; then
 		chdist --data-dir="$CHPATH" apt-get "$SUITE-$ARCH" --download-only --only-source source ${SRCPACKAGE}=${VERSION} 2>&1 | tee ${TMPLOG}
 	else
@@ -970,13 +970,13 @@ build_rebuild() {
 #
 
 mkdir -p /srv/reproducible-results/rbuild-debian
-TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results/rbuild-debian -d)  # where everything actually happens
+TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results/rbuild-debian -d r-b-build.XXXXXXXX)  # where everything actually happens
 trap cleanup_all INT TERM EXIT
 cd $TMPDIR
 
 DATE=$(date -u +'%Y-%m-%d %H:%M')
 START=$(date +'%s')
-RBUILDLOG=$(mktemp --tmpdir=$TMPDIR)
+RBUILDLOG=$(mktemp --tmpdir=$TMPDIR rbuildlog.XXXXXXX)
 JOB="${JOB_NAME#reproducible_builder_}/${BUILD_ID}"
 
 #



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

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