summaryrefslogtreecommitdiffstats
path: root/bin/jenkins_master_wrapper.sh
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-08-11 01:30:56 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-11 01:30:56 +0200
commit6edbbf7dc6d422b5fdda7664f8f9a7d55bb61f52 (patch)
tree64d7e25b2e3b682e6faa9c9c76cf2db15b3a88d2 /bin/jenkins_master_wrapper.sh
parent66b35bd6fbc158df0e5f5e05c3a4192b5add3141 (diff)
downloadjenkins.debian.net-6edbbf7dc6d422b5fdda7664f8f9a7d55bb61f52.tar.xz
lvc: use hopefully correct node results dir
Diffstat (limited to 'bin/jenkins_master_wrapper.sh')
-rwxr-xr-xbin/jenkins_master_wrapper.sh7
1 files changed, 3 insertions, 4 deletions
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