From b80e27ed808c00ccb190a8234207311e72c3b416 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 19 Dec 2017 09:00:54 +0100
Subject: [PATCH] jenkins-ci: fix/update CloudBees jobs

---
 jenkins/cloudbees_build |  4 ++--
 jenkins/cloudbees_doc   | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index 08eff45..8657176 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -71,6 +71,6 @@ make distclean all
 make runtests
 
 ###########################################
-# Create distribution
+# Create cache
 
-tar --exclude=test* -czf pvAccess.CB-dist.tar.gz bin lib include dbd LICENSE COPYRIGHT
+tar --exclude=test* -czf pvAccess.CB-dist.tar.gz bin lib include dbd cfg LICENSE COPYRIGHT
diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index 8e8518f..61459f3 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -21,14 +21,7 @@ installE4 () {
     local module=$1
     local branch=$2
 
-    # If microbench version does not exist, try without
-    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
+    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
     tar -xzf ${module}.CB-dist.tar.gz
 }
 
@@ -38,7 +31,6 @@ installE4 () {
 BASE=3.15.4
 PUBLISH=${PUBLISH:-NO}
 BRANCH=${BRANCH:-master}
-MB=NO_MICROBENCH
 
 ###########################################
 # Fetch and unpack dependencies