diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index f5550b5..d2b3a9a 100644 --- a/jenkins/cloudbees_build +++ b/jenkins/cloudbees_build @@ -21,28 +21,19 @@ installE4 () { local module=$1 local branch=$2 - # If microbench version does not exist, try without - if [ "${MB}" = "WITH_MICROBENCH" ]; then - if ! wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then - wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz - fi - else - wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz - fi + wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz tar -xzf ${module}.CB-dist.tar.gz } ########################################### -# Defaults for EPICS Base and MB +# Defaults for EPICS Base DEFAULT_BASE=3.15.4 BASE=${BASE:-${DEFAULT_BASE}} -MB=${MB:-"NO_MICROBENCH"} ########################################### # Dependent module branches -PVCOMMON_BRANCH="master" PVDATA_BRANCH="master" PVACCESS_BRANCH="master" @@ -58,7 +49,6 @@ cd ${STUFF} installTool Boost 1.61.0 installTool Base ${BASE} -installE4 pvCommon ${PVCOMMON_BRANCH} installE4 pvData ${PVDATA_BRANCH} installE4 pvAccess ${PVACCESS_BRANCH}