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

jenkins: fix installE4 logic, add pvCommon dependency

Browse Source
This commit is contained in:
Ralph Lange
2016-07-22 14:59:12 +02:00
parent 515e7926b8
commit a634d53a00
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jenkins/cloudbees_build
View File

@ -21,9 +21,12 @@ installE4 () {
local module=$1 local module=$1
local branch=$2 local branch=$2
wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=${MB}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
# If microbench version does not exist, try without # If microbench version does not exist, try without
if [ $? -eq 8 -a \( "${MB}" = "WITH_MICROBENCH" \) ]; then 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 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 fi
tar -xzf ${module}.CB-dist.tar.gz tar -xzf ${module}.CB-dist.tar.gz
@ -39,6 +42,7 @@ 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"
@ -54,6 +58,7 @@ 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}
@ -81,4 +86,4 @@ make runtests
########################################### ###########################################
# Create distribution # Create distribution
tar -czf pvDatabase.CB-dist.tar.gz lib include dbd COPYRIGHT LICENSE tar -czf pvDatabase.CB-dist.tar.gz lib include dbd LICENSE

7
jenkins/cloudbees_doc
View File

@ -21,9 +21,12 @@ installE4 () {
local module=$1 local module=$1
local branch=$2 local branch=$2
wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=${MB}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
# If microbench version does not exist, try without # If microbench version does not exist, try without
if [ $? -eq 8 -a \( "${MB}" = "WITH_MICROBENCH" \) ]; then 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 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 fi
tar -xzf ${module}.CB-dist.tar.gz tar -xzf ${module}.CB-dist.tar.gz