From 79a88c73eb95c3b96b8c27d36a3f007573b398c4 Mon Sep 17 00:00:00 2001 From: Rich Bennett Date: Fri, 29 Sep 2017 17:15:30 -0400 Subject: [PATCH] Allow multiple sphinx-build threads on verify job Add branch and ignore value on all submodules Remove duplicate httpdomain requirement Issue-ID: DOC-93 Change-Id: I129e288b2d6825ef21efe48acfb5df2c2ffc8bdb Signed-off-by: Rich Bennett --- .gitmodules | 68 ++++++++++++++++++++++++++++++++++++++++++ docs/submodules/usecase-ui.git | 2 +- etc/requirements.txt | 1 - tox.ini | 4 +-- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5ba9b96f3..1b6a6bb48 100644 --- a/.gitmodules +++ b/.gitmodules @@ -156,102 +156,170 @@ [submodule "docs/submodules/multicloud/framework.git"] path = docs/submodules/multicloud/framework.git url = ../multicloud/framework + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/dashboard.git"] path = docs/submodules/ccsdk/dashboard.git url = ../ccsdk/dashboard + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/distribution.git"] path = docs/submodules/ccsdk/distribution.git url = ../ccsdk/distribution + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/parent.git"] path = docs/submodules/ccsdk/parent.git url = ../ccsdk/parent + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/platform/blueprints.git"] path = docs/submodules/ccsdk/platform/blueprints.git url = ../ccsdk/platform/blueprints + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/platform/nbapi.git"] path = docs/submodules/ccsdk/platform/nbapi.git url = ../ccsdk/platform/nbapi + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/platform/plugins.git"] path = docs/submodules/ccsdk/platform/plugins.git url = ../ccsdk/platform/plugins + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/sli/adaptors.git"] path = docs/submodules/ccsdk/sli/adaptors.git url = ../ccsdk/sli/adaptors + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/sli/core.git"] path = docs/submodules/ccsdk/sli/core.git url = ../ccsdk/sli/core + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/sli/northbound.git"] path = docs/submodules/ccsdk/sli/northbound.git url = ../ccsdk/sli/northbound + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/sli/plugins.git"] path = docs/submodules/ccsdk/sli/plugins.git url = ../ccsdk/sli/plugins + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/storage/esaas.git"] path = docs/submodules/ccsdk/storage/esaas.git url = ../ccsdk/storage/esaas + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/storage/pgaas.git"] path = docs/submodules/ccsdk/storage/pgaas.git url = ../ccsdk/storage/pgaas + branch = . + ignore = dirty [submodule "docs/submodules/ccsdk/utils.git"] path = docs/submodules/ccsdk/utils.git url = ../ccsdk/utils + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/adaptors.git"] path = docs/submodules/sdnc/adaptors.git url = ../sdnc/adaptors + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/architecture.git"] path = docs/submodules/sdnc/architecture.git url = ../sdnc/architecture + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/core.git"] path = docs/submodules/sdnc/core.git url = ../sdnc/core + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/features.git"] path = docs/submodules/sdnc/features.git url = ../sdnc/features + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/northbound.git"] path = docs/submodules/sdnc/northbound.git url = ../sdnc/northbound + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/oam.git"] path = docs/submodules/sdnc/oam.git url = ../sdnc/oam + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/parent.git"] path = docs/submodules/sdnc/parent.git url = ../sdnc/parent + branch = . + ignore = dirty [submodule "docs/submodules/sdnc/plugins.git"] path = docs/submodules/sdnc/plugins.git url = ../sdnc/plugins + branch = . + ignore = dirty [submodule "docs/submodules/portal.git"] path = docs/submodules/portal.git url = ../portal + branch = . + ignore = dirty [submodule "docs/submodules/sdc.git"] path = docs/submodules/sdc.git url = ../sdc + branch = . + ignore = dirty [submodule "docs/submodules/sdc/jtosca.git"] path = docs/submodules/sdc/jtosca.git url = ../sdc/jtosca + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc-distribution-client.git"] path = docs/submodules/sdc/sdc-distribution-client.git url = ../sdc/sdc-distribution-client + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc-docker-base.git"] path = docs/submodules/sdc/sdc-docker-base.git url = ../sdc/sdc-docker-base + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc-titan-cassandra.git"] path = docs/submodules/sdc/sdc-titan-cassandra.git url = ../sdc/sdc-titan-cassandra + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc-tosca.git"] path = docs/submodules/sdc/sdc-tosca.git url = ../sdc/sdc-tosca + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc-workflow-designer.git"] path = docs/submodules/sdc/sdc-workflow-designer.git url = ../sdc/sdc-workflow-designer + branch = . + ignore = dirty [submodule "docs/submodules/sdc/sdc_common.git"] path = docs/submodules/sdc/sdc_common.git url = ../sdc/sdc_common + branch = . + ignore = dirty [submodule "docs/submodules/vid.git"] path = docs/submodules/vid.git url = ../vid + branch = . + ignore = dirty [submodule "docs/submodules/vid/asdcclient.git"] path = docs/submodules/vid/asdcclient.git url = ../vid/asdcclient + branch = . + ignore = dirty [submodule "docs/submodules/usecase-ui.git"] path = docs/submodules/usecase-ui.git url = ../usecase-ui + branch = . + ignore = dirty diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git index 10c717299..0fb8edd56 160000 --- a/docs/submodules/usecase-ui.git +++ b/docs/submodules/usecase-ui.git @@ -1 +1 @@ -Subproject commit 10c71729955623307b0b4a170a6ef004ab188a91 +Subproject commit 0fb8edd56b99f8e2a1a34d4a46eadf1862177c0a diff --git a/etc/requirements.txt b/etc/requirements.txt index 66f761074..35f9168f4 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -9,5 +9,4 @@ sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-swaggerdoc sphinxcontrib-plantuml -sphinxcontrib-httpdomain sphinx_bootstrap_theme>=0.4.11 diff --git a/tox.ini b/tox.ini index e3349e5a5..b9b1dccfb 100644 --- a/tox.ini +++ b/tox.ini @@ -6,10 +6,10 @@ skipsdist = true [testenv:docs] deps = -r{toxinidir}/etc/requirements.txt commands = - sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + sphinx-build -j 4 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" whitelist_externals = echo [testenv:docs-linkcheck] deps = -r{toxinidir}/etc/requirements.txt -commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck +commands = sphinx-build -j 4 -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck -- 2.16.6