diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-08-11 01:17:35 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-08-11 01:17:35 +0200 |
| commit | 51fc0482b0bb89b7c0e48634fb1b4b0cb5b0d467 (patch) | |
| tree | ff232d8a01247dcb03c1c72a7e583a618df15601 | |
| parent | ad18ce6e0be1828931ef6ba960313d67972de998 (diff) | |
| download | jenkins.debian.net-51fc0482b0bb89b7c0e48634fb1b4b0cb5b0d467.tar.xz | |
lvc: expect results in workspace
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index e7d25b5c..b5f7c6eb 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -71,13 +71,13 @@ 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/$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:$NODE_RESULTS/" "$RESULTS/" - ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "rm -r $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" ls -lad "$RESULTS" ls -la "$RESULTS" fi |