diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-08-30 22:55:57 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-08-30 22:55:57 +0200 |
| commit | fe15acc2b74e097ca7c4d72ae912504910546a73 (patch) | |
| tree | 5dad6f9b70c1492080f21160933e0ac419d65bba | |
| parent | d5bb83e244d6f5f7a4aead874abd6c31908eceb9 (diff) | |
| download | jenkins.debian.net-fe15acc2b74e097ca7c4d72ae912504910546a73.tar.xz | |
reproducible: handle remote $TMPDIR properly
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 2 | ||||
| -rwxr-xr-x | 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 b77c97e1..c1210184 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 3f01912f..21874d26 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 |