From 00c7e85708672f94c7db05a2ec810b43de0d1d9b Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Sun, 5 Jun 2016 11:46:53 +0200 Subject: lvc: pass EXECUTOR_NUMBER to remote nodes Signed-off-by: Holger Levsen --- bin/jenkins_master_wrapper.sh | 2 +- 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 -- cgit v1.2.3-70-g09d2