summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/lvc_retreive_artifacts.sh4
-rw-r--r--job-cfg/lvc.yaml6
2 files changed, 4 insertions, 6 deletions
diff --git a/bin/lvc_retreive_artifacts.sh b/bin/lvc_retreive_artifacts.sh
index 4ec30577..146558b6 100755
--- a/bin/lvc_retreive_artifacts.sh
+++ b/bin/lvc_retreive_artifacts.sh
@@ -9,6 +9,6 @@ common_init "$@"
# main
echo "$(date -u) - Starting to rsync results."
-rsync -r -v -e "ssh -o 'Batchmode = yes'" $TRIG_HOST:$TRIG_RESULTS/ $TRIG_RESULTS/
-chmod 775 $RESULTS
+rsync -r -v -e "ssh -o 'Batchmode = yes'" $TRIG_NODE:$TRIG_RESULTS/ /$TRIG_RESULTS/
+chmod 775 $TRIG_RESULTS
echo "$(date -u) - the end."
diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml
index 1d2cd777..f642c321 100644
--- a/job-cfg/lvc.yaml
+++ b/job-cfg/lvc.yaml
@@ -47,9 +47,7 @@
- shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh {my_iso} /srv/jenkins/cucumber/features {my_opts}'
- trigger-builds:
- project: lvc_retreive_artifacts
- predefined-parameters:
- TRIG_HOST=$HOST
- TRIG_WORKDIR=$WORKDIR
+ predefined-parameters: "TRIG_NODE=$NODE_NAME\nTRIG_RESULTS=$WORKSPACE/results"
triggers:
- timed: '{my_time}'
node: 'lvc'
@@ -68,7 +66,7 @@
- sidebar: *sb3
parameters:
- string:
- name: TRIG_HOST
+ name: TRIG_NODE
description: The host that the job triggering this one was running on
- string:
name: TRIG_RESULTS