summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-20 17:09:28 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-20 17:12:52 +0200
commita76acb1bde9bc32e17b0c58ed94cd8f7ddb5f371 (patch)
tree3e42ed80f49261fb6407ae1ba4903bbfbc8f7466 /bin
parent876a1ef795ea6896a50b0ffeddba737951d4d885 (diff)
downloadjenkins.debian.net-a76acb1bde9bc32e17b0c58ed94cd8f7ddb5f371.tar.xz
lvc: pass $PU_GIT_BRANCH via the wrapper command line
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/jenkins_master_wrapper.sh2
-rwxr-xr-xbin/jenkins_node_wrapper.sh1
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";