openstack
/
openstack-doc-tools
Code Issues Proposed changes

Merge "Do no build Debian Install Guide by default"

This commit is contained in:
Jenkins 2015-05-07 18:02:12 +00:00 committed by Gerrit Code Review
parent e4c8992edb 4eadc65172
commit 5da924da65
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE_NOTES.rst
View File

@ -1,6 +1,13 @@
Release notes
=============
0.27
----
* ``openstack-doc-test``: Do not build Debian Install Guide by
default, built it only if the parameter ``--enable-debian-install``
is passed.
0.26
----

24
os_doc_tools/doctest.py
View File

@ -893,14 +893,15 @@ def build_book(book, publish_path, log_path):
out_file.write(output)
if base_book == "install-guide":
# Build Debian
base_book = "install-guide (for debian)"
output = subprocess.check_output(
["mvn", "generate-sources", "-B",
comments, release,
"-Doperating.system=apt-debian", "-Dprofile.os=debian"],
stderr=subprocess.STDOUT
)
out_file.write(output)
if cfg.CONF.enable_debian_install:
base_book = "install-guide (for debian)"
output = subprocess.check_output(
["mvn", "generate-sources", "-B",
comments, release,
"-Doperating.system=apt-debian", "-Dprofile.os=debian"],
stderr=subprocess.STDOUT
)
out_file.write(output)
# Build Fedora
base_book = "install-guide (for Fedora)"
output = subprocess.check_output(
@ -929,7 +930,10 @@ def build_book(book, publish_path, log_path):
stderr=subprocess.STDOUT
)
# Success
base_book = "install-guide (for Debian, Fedora, openSUSE, Ubuntu)"
base_book = "install-guide (for "
if cfg.CONF.enable_debian_install:
base_book += "Debian, "
base_book += "Fedora, openSUSE, Ubuntu)"
# HOT template guide
elif base_book == 'hot-guide':
# Make sure that the build dir is clean
@ -1457,6 +1461,8 @@ cli_OPTS = [
cfg.MultiStrOpt("url-exception",
help="URL that will be skipped during reachability "
"check."),
cfg.BoolOpt("enable-debian-install", default=False,
help="Enable building of Debian Install Guide."),
]
OPTS = [