From 6edbbf7dc6d422b5fdda7664f8f9a7d55bb61f52 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 11 Aug 2016 01:30:56 +0200 Subject: lvc: use hopefully correct node results dir --- bin/jenkins_master_wrapper.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index b5f7c6eb..cf523941 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -71,13 +71,12 @@ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "$PARAMS" || { # grab artifacts and tidy up at the other end if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then RESULTS="$WORKSPACE/results" - #NODE_RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results" - + NODE_RESULTS="/var/lib/jenkins/jobs/jenkins/pseudo-hosts/profitbricks-build10-amd64~jenkins/$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" ls -lad "$RESULTS" ls -la "$RESULTS" fi -- cgit v1.2.3-70-g09d2