From 6249ae2c4410034dfb6ea21db622141c30c369eb Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 22 Jul 2016 14:57:48 +0200
Subject: [PATCH] jenkins: fix installE4 logic, add pvCommon dependency

---
 jenkins/cloudbees_build | 9 +++++++--
 jenkins/cloudbees_doc   | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index 9624e93..89ce218 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -21,9 +21,12 @@ 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
+    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
@@ -39,6 +42,7 @@ MB=${MB:-"NO_MICROBENCH"}
 ###########################################
 # Dependent module branches
 
+PVCOMMON_BRANCH="master"
 PVDATA_BRANCH="master"
 PVACCESS_BRANCH="master"
 NORMATIVETYPES_BRANCH="master"
@@ -55,6 +59,7 @@ cd ${STUFF}
 installTool Boost 1.61.0
 installTool Base ${BASE}
 
+installE4 pvCommon ${PVCOMMON_BRANCH}
 installE4 pvData ${PVDATA_BRANCH}
 installE4 pvAccess ${PVACCESS_BRANCH}
 installE4 normativeTypes ${NORMATIVETYPES_BRANCH}
diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index 37a806e..d65c831 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -21,9 +21,12 @@ 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
+    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