jenkins-ci: fix/update CloudBees jobs

This commit is contained in:
Ralph Lange
2017-12-19 09:35:18 +01:00
parent b26c0ecd71
commit 2904e00b3d
2 changed files with 2 additions and 10 deletions

View File

@ -74,6 +74,6 @@ make distclean all
make runtests make runtests
########################################### ###########################################
# Create distribution # Create cache
tar -czf pvDatabase.CB-dist.tar.gz lib include dbd LICENSE tar -czf pvDatabase.CB-dist.tar.gz lib include dbd LICENSE

View File

@ -21,14 +21,7 @@ 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
} }
@ -38,7 +31,6 @@ installE4 () {
BASE=3.15.4 BASE=3.15.4
PUBLISH=${PUBLISH:-NO} PUBLISH=${PUBLISH:-NO}
BRANCH=${BRANCH:-master} BRANCH=${BRANCH:-master}
MB=NO_MICROBENCH
########################################### ###########################################
# Fetch and unpack dependencies # Fetch and unpack dependencies