diff options
| author | Philip Hands <phil@hands.com> | 2016-07-22 14:45:25 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-22 13:20:30 -0400 |
| commit | 40a9e3deebaeb3d9415dc39ac153f038e7c3aaa8 (patch) | |
| tree | ba5c5fb5bc34d5b2ef35af235c6a3b11644a8a69 /bin/jenkins_master_wrapper.sh | |
| parent | b0476ce863ecfb8ec7acf68708a40916a80bdbfa (diff) | |
| download | jenkins.debian.net-40a9e3deebaeb3d9415dc39ac153f038e7c3aaa8.tar.xz | |
anchor wrapper patterns, and put results in the right place
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/jenkins_master_wrapper.sh')
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 61b5d234..ea3c6383 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -70,15 +70,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" + 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'" "$NODE_NAME:$NODE_RESULTS/" "$RESULTS/" - chmod 775 /$WORKSPACE/results/ - ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -rf '$NODE_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'" fi exit $RETVAL |