diff options
author | Holger Levsen <holger@layer-acht.org> | 2015-08-30 23:46:59 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2015-08-30 23:46:59 +0200 |
commit | a3f5858dd60c79c3756291561ea447ea0be6019c (patch) | |
tree | 28f4cc972f1edc1ccf4bebec14685c6337f04c85 /bin/reproducible_build.sh | |
parent | 62103d9a1069774fa9744d55b74394ada6d2cdc0 (diff) | |
download | jenkins.debian.net-a3f5858dd60c79c3756291561ea447ea0be6019c.tar.xz |
reproducible: allow remote cleanup
Diffstat (limited to 'bin/reproducible_build.sh')
-rwxr-xr-x | bin/reproducible_build.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 22bf74db..8bc5928e 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -100,9 +100,9 @@ cleanup_all() { # XXX quite ugly: this is just needed to get the correct value of the # compressed files in the html. It's cheap and quite safe so, *shrugs*... gen_package_html $SRCPACKAGE + cd + rm -r $TMPDIR fi - cd - rm -r $TMPDIR if ! $BAD_LOCKFILE ; then rm -f $LOCKFILE ; fi } @@ -509,7 +509,7 @@ check_buildinfo() { else ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR} rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 . - ssh -p $PORT1 $NODE1 "rm -r $TMPDIR/b1" + ssh -p $PORT1 $NODE1 "rm -r $TMPDIR" fi grep-dctrl -s Build-Environment -n ${SRCPACKAGE} ./b1/$BUILDINFO > $TMPFILE1 set +e @@ -531,7 +531,7 @@ build_rebuild() { else ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR} rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 . - ssh -p $PORT1 $NODE1 "rm -r $TMPDIR/b1" + ssh -p $PORT1 $NODE1 "rm -r $TMPDIR" fi if [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then # the first build did not FTBFS, try rebuild it. @@ -544,7 +544,7 @@ build_rebuild() { else ssh -p $PORT2 $NODE2 /srv/jenkins/bin/reproducible_build.sh 2 ${SRCPACKAGE} ${SUITE} ${TMPDIR} rsync -e "ssh -p $PORT2" -r $NODE2:$TMPDIR/b2 . - ssh -p $PORT2 $NODE2 "rm -r $TMPDIR/b2" + ssh -p $PORT2 $NODE2 "rm -r $TMPDIR" fi if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then # both builds were fine, i.e., they did not FTBFS. |