[Qa-jenkins-scm] [jenkins.debian.net] 01/01: try putting the rsync'd artifacts back under $WORKSPACE

[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 ad36d2e1a18b5e40ce9bdb57479a5ec096ccab9e
Author: Philip Hands <phil at hands.com>
Date:   Wed Jul 27 23:11:37 2016 +0200

    try putting the rsync'd artifacts back under $WORKSPACE
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/jenkins_master_wrapper.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh
index 319c696..2701672 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

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