epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

jenkins: remove microbench option and pvCommon dependency from CB build

Browse Source
This commit is contained in:
Ralph Lange
2017-11-15 17:12:56 +01:00
parent c6339f4f1b
commit 955947fd0f
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jenkins/cloudbees_build
View File

@ -21,28 +21,19 @@ installE4 () {
local module=$1 local module=$1
local branch=$2 local branch=$2
# If microbench version does not exist, try without wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
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
tar -xzf ${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 DEFAULT_BASE=3.15.4
BASE=${BASE:-${DEFAULT_BASE}} BASE=${BASE:-${DEFAULT_BASE}}
MB=${MB:-"NO_MICROBENCH"}
########################################### ###########################################
# Dependent module branches # Dependent module branches
PVCOMMON_BRANCH="master"
PVDATA_BRANCH="master" PVDATA_BRANCH="master"
PVACCESS_BRANCH="master" PVACCESS_BRANCH="master"
@ -58,7 +49,6 @@ cd ${STUFF}
installTool Boost 1.61.0 installTool Boost 1.61.0
installTool Base ${BASE} installTool Base ${BASE}
installE4 pvCommon ${PVCOMMON_BRANCH}
installE4 pvData ${PVDATA_BRANCH} installE4 pvData ${PVDATA_BRANCH}
installE4 pvAccess ${PVACCESS_BRANCH} installE4 pvAccess ${PVACCESS_BRANCH}