[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] openwrt: add missing RUN to node_cleanup

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
049f28b1 by Paul Spooren at 2022-04-09T13:40:50+02:00
openwrt: add missing RUN to node_cleanup

Signed-off-by: Paul Spooren <mail at aparcar.org>

- - - - -


1 changed file:

- bin/reproducible_openwrt.sh


Changes:

=====================================
bin/reproducible_openwrt.sh
=====================================
@@ -42,7 +42,8 @@ node_debug() {
 
 # only called direct on a remote build node
 node_cleanup_tmpdirs() {
-	export TMPBUILDDIR=$1
+	export RUN=$1
+	export TMPBUILDDIR=$2
 	cd
 	# (very simple) check we are deleting the right stuff
 	if [ "${TMPBUILDDIR:0:23}" != "/srv/workspace/chroots/" ] || [ ${#TMPBUILDDIR} -le 23 ] ; then
@@ -82,8 +83,8 @@ master_cleanup_tmpdirs() {
 		rsync -av "$GENERIC_NODE2:$TMPBUILDDIR/build_logs.tar.xz" "$WORKSPACE/results/build_logs_b2.tar.xz" || true
 	fi
 
-	$SSHN1 "reproducible_openwrt" node node_cleanup_tmpdirs "$TMPBUILDDIR" || true
-	$SSHN2 "reproducible_openwrt" node node_cleanup_tmpdirs "$TMPBUILDDIR" || true
+	$SSHN1 "reproducible_openwrt" node node_cleanup_tmpdirs "b1" "$TMPBUILDDIR" || true
+	$SSHN2 "reproducible_openwrt" node node_cleanup_tmpdirs "b2" "$TMPBUILDDIR" || true
 
 	cd
 	# (very simple) check we are deleting the right stuff
@@ -473,7 +474,7 @@ build_two_times() {
 	rsync -av "$GENERIC_NODE1:$TMPBUILDDIR/$RUN/" "$RESULTSDIR/$RUN/"
 	rsync -av "$GENERIC_NODE1:$TMPBUILDDIR/build_logs.tar.xz" "$WORKSPACE/results/build_logs_b1.tar.xz"
 	rsync -av "$GENERIC_NODE1:$TMPBUILDDIR/toolchain.html" "$RESULTSDIR/toolchain.html"
-	$SSHN1 "reproducible_openwrt" node node_cleanup_tmpdirs "$TMPBUILDDIR"
+	$SSHN1 "reproducible_openwrt" node node_cleanup_tmpdirs "$RUN" "$TMPBUILDDIR"
 
 	## second run
 	local RUN=b2
@@ -482,7 +483,7 @@ build_two_times() {
 	# rsync back logs and images
 	rsync -av "$GENERIC_NODE2:$TMPBUILDDIR/$RUN/" "$RESULTSDIR/$RUN/"
 	rsync -av "$GENERIC_NODE2:$TMPBUILDDIR/build_logs.tar.xz" "$WORKSPACE/results/build_logs_b2.tar.xz"
-	$SSHN2 "reproducible_openwrt" node node_cleanup_tmpdirs "$TMPBUILDDIR"
+	$SSHN2 "reproducible_openwrt" node node_cleanup_tmpdirs "$RUN" "$TMPBUILDDIR"
 }
 
 



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/049f28b1555a87c6129dade7f57ab9ce7cc4237f
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/20220409/d89ebe2c/attachment-0001.htm>