diff options
-rw-r--r-- | .gitreview | 1 | ||||
-rw-r--r-- | docs/smsummary.rst | 9 | ||||
m--------- | docs/submodules/aaf/authz.git | 0 | ||||
m--------- | docs/submodules/appc.git | 0 | ||||
m--------- | docs/submodules/clamp.git | 0 | ||||
m--------- | docs/submodules/holmes/engine-management.git | 0 | ||||
m--------- | docs/submodules/holmes/rule-management.git | 0 | ||||
m--------- | docs/submodules/multicloud/azure.git | 0 | ||||
m--------- | docs/submodules/multicloud/framework.git | 0 | ||||
m--------- | docs/submodules/multicloud/k8s.git | 0 | ||||
-rw-r--r-- | shell/smsummary.sh | 10 | ||||
-rw-r--r-- | tox.ini | 4 |
12 files changed, 11 insertions, 13 deletions
diff --git a/.gitreview b/.gitreview index c088dd69b..e91bbfcf3 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=doc.git +defaultbranch=casablanca diff --git a/docs/smsummary.rst b/docs/smsummary.rst index 13e0e4563..3bdafe086 100644 --- a/docs/smsummary.rst +++ b/docs/smsummary.rst @@ -5,6 +5,9 @@ Contributing Submodule Summary ============================== -.. code-block:: console - -.. literalinclude:: _static/smsummary.out +This summary is currently only generated in a jenkins verify job log. The table +will be empty when published at Read The Docs. + +.. csv-table:: + :header: "Commit Hash", "Submodule Repository", "Reference" + :file: _static/smsummary.csv diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git -Subproject 7425da5594670b182122306c70ef8846f53c175 +Subproject 230727c305d88560ec9d61a7048b0194a81650e diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git -Subproject 01167176ce6f6c663055f77ee01cb18793aa8ea +Subproject 82c049edee42af368a3758e1d8bb4ab1d055829 diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git -Subproject b0eb2982ff2abccb178d378d9a6a6c9006559b8 +Subproject f1d69906060fe3ac9a2cccb6e0b4fd1c877452a diff --git a/docs/submodules/holmes/engine-management.git b/docs/submodules/holmes/engine-management.git -Subproject a3950b1227da2952b60920fec0bd87eef579100 +Subproject bf652bc2ae7362eff1ab0a15b719465b296e477 diff --git a/docs/submodules/holmes/rule-management.git b/docs/submodules/holmes/rule-management.git -Subproject c066e7d1f7cfbbe74a1e740a939bb268f4a92b3 +Subproject 1b2e3a414826c059557845cbf6fd32eeb095f9b diff --git a/docs/submodules/multicloud/azure.git b/docs/submodules/multicloud/azure.git -Subproject 9abc9c644a96e74612a995b7194c69167317a6a +Subproject 379a8ac73b99ebc43b917d7128be0099c56e961 diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git -Subproject 2dfba4b15af4fea7092dae1619cf985013b7a12 +Subproject b9844d09ce741d6993c479d7863f9dbfdd0d11c diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git -Subproject 3fec487b6db21303516380dbd7635978164bb8a +Subproject 7d2d48d3d0b35de0acd03c6e8a1261efd736edc diff --git a/shell/smsummary.sh b/shell/smsummary.sh index 0b971f8af..2b1b776d1 100644 --- a/shell/smsummary.sh +++ b/shell/smsummary.sh @@ -17,11 +17,5 @@ # Usage: sh smsummary.sh output_file # -echo "************************************************************************************" > $1 -echo "* Submodule branches used to build this version of the documentation. *" >> $1 -echo "************************************************************************************" >> $1 - -git submodule foreach git for-each-ref \ - --format='%(committerdate:iso8601) %(objectname) %(HEAD) %(refname) %(subject)' \ - --sort -committerdate refs/heads/ | \ - sed -e 's:^: :' -e 's: Entering .docs/submodules/::' -e 's:.git.$::' -e 's:refs/heads/::' >> $1 +cd docs/submodules +git submodule status | sed -e 's:^ ::' -e 's: :,:' -e 's: :,:' -e 's:[()]::g' -e 's:\.git::' > $1 @@ -6,8 +6,8 @@ skipsdist = true [testenv:docs] deps = -r{toxinidir}/etc/requirements.txt commands = - sh {toxinidir}/shell/smsummary.sh {toxinidir}/docs/_static/smsummary.out - echo "Summary of submodule versions used in html build in {toxinidir}/docs/_static/smsummary.out" + sh {toxinidir}/shell/smsummary.sh {toxinidir}/docs/_static/smsummary.csv + echo "Summary of submodule versions used in html build in {toxinidir}/docs/_static/smsummary.csv" sphinx-build -j 1 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" whitelist_externals = |