diff options
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 2 | ||||
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index 36843d30..aa571089 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 $EXECUTOR_NUMBER $@" + lvc_*) PARAMS="$JOB_NAME $EXECUTOR_NUMBER PU_GIT_BRANCH=$PU_GIT_BRANCH $@" export ;; *) PARAMS="$JOB_NAME" diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index f43d4213..3cac5e63 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -75,6 +75,7 @@ elif [[ "$*" =~ lvc_.* ]] ; then echo debug end export JOB_NAME=$1 ; shift export EXECUTOR_NUMBER=$1 ; shift + export PU_GIT_BRANCH=${1#*=} ; shift export WORKSPACE=~jenkins/jobs/$JOB_NAME/workspace COMMAND="/srv/jenkins/bin/lvc.sh $@" exec $COMMAND; croak "Exec failed"; |