diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index f410830..3756def 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="" +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_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