opendev/system-config
Code Issues Proposed changes

Removes unused gerrit-doc-properties.sh file as it is identical

Browse Source 
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 <paul.belanger@polybeacon.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
annegentle 2012-11-09 15:48:38 -06:00 committed by Jenkins
parent 09fbdd5715
commit 68af10596d
2 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins/files/slave_scripts/docbook-properties.sh
View File

@ -16,7 +16,7 @@ then
DOC_COMMENTS_ENABLED=0
fi
# The stable/<releasename> branch should get published to /releasename, such as diablo or essex
# The stable/<releasename> branch should get published to /releasename, such as folsom or essex
if [[ $BRANCH =~ ^stable/(.*)$ ]]
then
DOC_RELEASE_PATH=${BASH_REMATCH[1]}

29
modules/jenkins/files/slave_scripts/gerrit-doc-properties.sh
View File

@ -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