From 68af10596ddd4e34ca3e6e8ea7a86d32102e2cac Mon Sep 17 00:00:00 2001 From: annegentle Date: Fri, 9 Nov 2012 15:48:38 -0600 Subject: [PATCH] Removes unused gerrit-doc-properties.sh file as it is identical to docbook-properties.sh. Minor comment changes - just checking to make sure the folsom doc branch will have comments. Change-Id: I69a415354e60e01ade8e8341a93d68d3c09dee4a Reviewed-on: https://review.openstack.org/15793 Reviewed-by: Paul Belanger Reviewed-by: Clark Boylan Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../files/slave_scripts/docbook-properties.sh | 2 +- .../slave_scripts/gerrit-doc-properties.sh | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 modules/jenkins/files/slave_scripts/gerrit-doc-properties.sh diff --git a/modules/jenkins/files/slave_scripts/docbook-properties.sh b/modules/jenkins/files/slave_scripts/docbook-properties.sh index d94f665598..a6f7a90a97 100644 --- a/modules/jenkins/files/slave_scripts/docbook-properties.sh +++ b/modules/jenkins/files/slave_scripts/docbook-properties.sh @@ -16,7 +16,7 @@ then DOC_COMMENTS_ENABLED=0 fi -# The stable/ branch should get published to /releasename, such as diablo or essex +# The stable/ branch should get published to /releasename, such as folsom or essex if [[ $BRANCH =~ ^stable/(.*)$ ]] then DOC_RELEASE_PATH=${BASH_REMATCH[1]} diff --git a/modules/jenkins/files/slave_scripts/gerrit-doc-properties.sh b/modules/jenkins/files/slave_scripts/gerrit-doc-properties.sh deleted file mode 100755 index dc9afebb18..0000000000 --- a/modules/jenkins/files/slave_scripts/gerrit-doc-properties.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e - -# Documentation is published to a URL depending on the branch of the -# openstack-manuals project. This script determines what that location -# should be, and writes a properties file. This is used by Jenkins when -# invoking certain docs jobs and made available to maven. - -# In case we start doing something more sophisticated with other refs -# later (such as tags). -BRANCH=$GERRIT_REFNAME - -# The master branch should get published to /trunk -if [ $BRANCH == "master" ] -then - DOC_RELEASE_PATH="trunk" - DOC_COMMENTS_ENABLED=0 -fi - -# The stable/diablo branch should get published to /diablo -if [[ $BRANCH =~ ^stable/(.*)$ ]] -then - DOC_RELEASE_PATH=${BASH_REMATCH[1]} - DOC_COMMENTS_ENABLED=1 -fi - -echo "DOC_RELEASE_PATH=$DOC_RELEASE_PATH" >gerrit-doc.properties -echo "DOC_COMMENTS_ENABLED=$DOC_COMMENTS_ENABLED" >>gerrit-doc.properties - -pwd