From 443fdb09aa375d8696a3a631155e700ddbc01d86 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 9 Aug 2016 23:07:21 +0200 Subject: lvc: WORKSPACE is correct, magic --- bin/jenkins_master_wrapper.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index bf06b088..e7d25b5c 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -70,19 +70,15 @@ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "$PARAMS" || { # grab artifacts and tidy up at the other end if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then - echo "debug…" - echo "WORKSPACE=$WORKSPACE" - echo "JOB_NAME=$JOB_NAME" - echo "debug… end." RESULTS="$WORKSPACE/results" NODE_RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results" - RESULTS=$NODE_RESULTS # yes, this is redundant. let's see if this works. echo "$(date -u) - retrieving artifacts." set -x mkdir -p "$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