diff options
| author | Philip Hands <phil@hands.com> | 2016-06-05 11:46:53 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-05 11:51:25 +0200 |
| commit | 00c7e85708672f94c7db05a2ec810b43de0d1d9b (patch) | |
| tree | 6d557befec965dca16b4034ada7ed4bc9dab9196 | |
| parent | c606484102b4ea7b0dcee18cceaa2aaa93e1143f (diff) | |
| download | jenkins.debian.net-00c7e85708672f94c7db05a2ec810b43de0d1d9b.tar.xz | |
lvc: pass EXECUTOR_NUMBER to remote nodes
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 2 | ||||
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index e4d26627..36843d30 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -25,7 +25,7 @@ get_node_ssh_port $NODE_NAME case $JOB_NAME in rebootstrap_*) PARAMS="$JOB_NAME $@" ;; - lvc_*) PARAMS="$JOB_NAME $@" + lvc_*) PARAMS="$JOB_NAME $EXECUTOR_NUMBER $@" export ;; *) PARAMS="$JOB_NAME" diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index cacca9a3..ff91c4f9 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -73,9 +73,9 @@ elif [[ "$*" =~ lvc_.* ]] ; then echo debug begin export echo debug end - export JOB_NAME=$1 + export JOB_NAME=$1 ; shift + export EXECUTOR_NUMBER=$1 ; shift export WORKSPACE=~jenkins/jobs/$JOB_NAME/workspace - shift COMMAND="/srv/jenkins/bin/lvc.sh $@" exec $COMMAND; croak "Exec failed"; elif [ "$*" = "reproducible_nodes_info" ] ; then |