diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-07-19 23:22:15 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-19 23:22:15 +0200 |
| commit | 0ebc9c045e2f2b545862c0ff0f148ad5e578c266 (patch) | |
| tree | 85d7ed33e65340110d1f8c081bdd1d001afbe10c | |
| parent | 7099cf784398347093d6d3c96975fd4b4c4dcd5e (diff) | |
| download | jenkins.debian.net-0ebc9c045e2f2b545862c0ff0f148ad5e578c266.tar.xz | |
fixup 86e1763: do artifact retrieval in the master wrapper
(we use 'set -u' here so variables must be defined, plus a typo fixed
and some comments added…)
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 7b5c1ff3..d2753613 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -21,6 +21,10 @@ fi PORT=0 get_node_ssh_port $NODE_NAME +# don't try to fetch artifacts by default +RETRIEVE_ARTIFACTS=no + +# add some more params if needed, # by default we just use the job name as param case $JOB_NAME in rebootstrap_*) PARAMS="$JOB_NAME $@" @@ -60,9 +64,9 @@ ssh -o "BatchMode = yes" -p $PORT $NODE_NAME "$PARAMS" || { } # grab artifacts and tidy up at the other end -if [ "$RETRIEVE_ARTIFACTS" ] ; then +if [ "$RETRIEVE_ARTIFACTS" = "yes" ] ; then RESULTS="$WORKSPACE/results" - NODE_RESULTS="/var/libjenkins/jobs/$JOB_NAME/workspace/results" + NODE_RESULTS="/var/lib/jenkins/jobs/$JOB_NAME/workspace/results" echo "$(date -u) - retrieving artifacts." set -x |