From 3c946a91e8defb8416cf7fb70535809400d361bb Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 19 Jul 2016 22:00:34 +0200
Subject: [PATCH] jenkins: use install functions, add BRANCH variable to doc
 script

---
 jenkins/cloudbees_build | 29 ++++++++++++++++++++++++-----
 jenkins/cloudbees_doc   | 30 +++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index 7d1e48d..9340db8 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -6,14 +6,33 @@
 #
 # Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014-2015 ITER Organization.
+# Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.
 
+installTool () {
+    local module = $1
+    local version = $2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+installE4 () {
+    local module = $1
+    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 [ $? -eq 8 -a \( "${MB}" = "WITH_MICROBENCH" \) ]; 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
+    tar -xzf ${module}.CB-dist.tar.gz
+}
+
 ###########################################
-# Determine EPICS Base version
+# Defaults for EPICS Base and MB
 
 DEFAULT_BASE=3.15.4
-
 BASE=${BASE:-${DEFAULT_BASE}}
 MB=${MB:-"NO_MICROBENCH"}
 
@@ -26,8 +45,8 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}
 
-wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz
-tar -xzf base-${BASE}.CB-dist.tar.gz
+installTool Boost 1.61.0
+installTool Base ${BASE}
 
 ###########################################
 # Build
diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index 492bf5b..6fe3529 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -9,11 +9,33 @@
 # Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.
 
+installTool () {
+    local module = $1
+    local version = $2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+installE4 () {
+    local module = $1
+    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 [ $? -eq 8 -a \( "${MB}" = "WITH_MICROBENCH" \) ]; 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
+    tar -xzf ${module}.CB-dist.tar.gz
+}
+
 ###########################################
-# Set EPICS Base version and upload target
+# Defaults for EPICS Base and parameters
 
 BASE=3.15.4
 PUBLISH=${PUBLISH:-NO}
+BRANCH=${BRANCH:-master}
+MB=NO_MICROBENCH
 
 ###########################################
 # Fetch and unpack dependencies
@@ -24,16 +46,14 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}
 
-wget -nv https://openepics.ci.cloudbees.com/job/Doxygen-1.8.3_Build/lastSuccessfulBuild/artifact/doxygen-1.8.3.CB-dist.tar.gz
-tar -xzf doxygen-1.8.3.CB-dist.tar.gz
+installTool Doxygen 1.8.11
 
 ###########################################
 # Generate
 
 cd ${WORKSPACE}
 
-wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-pvData-master-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
-tar -xzf pvData.CB-dist.tar.gz
+installE4 pvData ${BRANCH}
 
 export PATH=${STUFF}/bin:${PATH}