diff options
| author | Philip Hands <phil@hands.com> | 2016-07-27 23:11:37 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-27 17:35:11 -0400 |
| commit | ad36d2e1a18b5e40ce9bdb57479a5ec096ccab9e (patch) | |
| tree | 84fe693acde55b1b52ae9b2052bb3587a9eb3dbf | |
| parent | 9be608925067e6995437a13b7f1cf58f59b137c9 (diff) | |
| download | jenkins.debian.net-ad36d2e1a18b5e40ce9bdb57479a5ec096ccab9e.tar.xz | |
try putting the rsync'd artifacts back under $WORKSPACE
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 319c696c..2701672b 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -70,13 +70,14 @@ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "$PARAMS" || { # grab artifacts and tidy up at the other end if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then - RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results" + RESULTS="$WORKSPACE/results" + NODE_RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results" echo "$(date -u) - retrieving artifacts." set -x mkdir -p "$RESULTS" - rsync -r -v -e "ssh -o 'Batchmode = yes' -p $PORT" "$NODE_NAME:$RESULTS/" "$RESULTS/" - ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -r $RESULTS" + rsync -r -v -e "ssh -o 'Batchmode = yes' -p $PORT" "$NODE_NAME:$NODE_RESULTS/" "$RESULTS/" + ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -r $NODE_RESULTS" fi exit $RETVAL |