[Qa-jenkins-scm] [jenkins.debian.net] 01/01: lvc: pass EXECUTOR_NUMBER to remote nodes

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 00c7e85708672f94c7db05a2ec810b43de0d1d9b
Author: Philip Hands <phil at hands.com>
Date:   Sun Jun 5 11:46:53 2016 +0200

    lvc: pass EXECUTOR_NUMBER to remote nodes
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 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 e4d2662..36843d3 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 cacca9a..ff91c4f 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git