From c0fada216eee17785a28b44baa7b5bca7a79d793 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 3 Sep 2015 11:49:49 +0200 Subject: [PATCH] jenkins: easier configuration of dependent module branches --- jenkins/cloudbees_build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index f7f5723..16b31c5 100644 --- a/jenkins/cloudbees_build +++ b/jenkins/cloudbees_build @@ -17,6 +17,10 @@ DEFAULT_BASE=3.14.12.5 BASE=${1:-${DEFAULT_BASE}} USE_MB=${2:-"MB_NO"} +# Dependent module branches (empty = master) +PVCOMMON_BRANCH="Release-4.1-" +PVDATA_BRANCH="" + ########################################### # Fetch and unpack dependencies @@ -27,12 +31,12 @@ mkdir -p ${STUFF} cd ${STUFF} wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz -wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz +wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_${PVDATA_BRANCH}Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz tar -xzf base-${BASE}.CB-dist.tar.gz tar -xzf pvData.CB-dist.tar.gz if [ "${USE_MB}" = "MB_YES" ]; then - wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Release-4.1-Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz + wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_${PVCOMMON_BRANCH}Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz tar -xzf pvCommon.CB-dist.tar.gz fi