[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: handle remote $TMPDIR properly

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit fe15acc2b74e097ca7c4d72ae912504910546a73
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Aug 30 22:55:57 2015 +0200

    reproducible: handle remote $TMPDIR properly
---
 bin/jenkins_node_wrapper.sh | 2 +-
 bin/reproducible_build.sh   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index b77c97e..c121018 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -68,7 +68,7 @@ if [[ "$*" =~ rebootstrap_.* ]] ; then
 	export LC_ALL=C
 	exec $REBOOTSTRAPSH ; croak "Exec failed";
 elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
-	exec /srv/jenkins/bin/reproducible_build.sh $2 $3 $4 ; croak "Exec failed";
+	exec /srv/jenkins/bin/reproducible_build.sh $2 $3 $4 $5 ; croak "Exec failed";
 elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/tmp.* ]] ; then
 	exec rsync --server --sender .* . $6 ; croak "Exec failed";
 elif   [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_bpi0" ] ; then
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 3f01912..21874d2 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -523,7 +523,7 @@ build_rebuild() {
 	if [ "$MODE" = "legacy" ] ; then
 		first_build
 	else
-		ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE}
+		ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR}
 		rsync -e "ssh -p $PORT1" -r $NODE1:$PWD/b1 .
 		ssh -p $PORT1 $NODE1 "rm -r $PWD/b1"
 	fi
@@ -536,7 +536,7 @@ build_rebuild() {
 		if [ "$MODE" = "legacy" ] ; then
 			second_build
 		else
-			ssh -p $PORT2 $NODE2 /srv/jenkins/bin/reproducible_build.sh 2
+			ssh -p $PORT2 $NODE2 /srv/jenkins/bin/reproducible_build.sh 2 ${SRCPACKAGE} ${SUITE} ${TMPDIR}
 			rsync -e "ssh -p $PORT2" -r $NODE2:$PWD/b2 .
 			ssh -p $PORT2 $NODE2 "rm -r $PWD/b2"
 		fi
@@ -574,6 +574,7 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	SRCPACKAGE="$2"
 	SUITE="$3"
 	SAVE_ARTIFACTS=0
+	TMPDIR="$4" ; mkdir $TMPDIR ; cd $$TMPDIR
 	get_source_package
 	mkdir b$MODE
 	if [ "$MODE" = "1" ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git