From d383161aabe70b04f389b9dae284a73acbf064d7 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 14 Sep 2015 16:33:25 +0200 Subject: [PATCH] jenkins: adapt doc script to new CloudBees jenkins job --- jenkins/cloudbees_doc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc index 4307660..080f811 100644 --- a/jenkins/cloudbees_doc +++ b/jenkins/cloudbees_doc @@ -10,11 +10,10 @@ # All rights reserved. Use is subject to license terms. ########################################### -# Determine EPICS Base version +# Set EPICS Base version and upload target -DEFAULT_BASE=3.14.12.5 - -BASE=${1:-${DEFAULT_BASE}} +BASE=3.15.2 +PUBLISH=${1:-DONT} ########################################### # Fetch and unpack dependencies @@ -43,4 +42,13 @@ doxygen ########################################### # Publish -rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/tip +if [ "${PUBLISH}" != "DONT" ]; then + # Upload explicit dummy to ensure target directory exists + echo "Created by CloudBees Jenkins upload job. Should be deleted as part of the job." > DUMMY + rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/DUMMY + + rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvAccessCPP/${PUBLISH}/ +fi +########################################### +# Publish +