Update casablanca branch references

Update submodule references

Update references for casablanca branches
Improve format of submodule manifest generated in verify log
Add default gitreview branch

Issue-ID: DOC-335
Change-Id: I03ce60277f6cc8ee412254cbd22d45b22749916f
Signed-off-by: Rich Bennett <rb2745@att.com>

diff --git a/.gitreview b/.gitreview
index c088dd6..e91bbfc 100644 (file)
--- 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 13e0e45..3bdafe0 100644 (file)
--- 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
index 7425da5..230727c 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit 7425da5594670b182122306c70ef8846f53c175b
+Subproject commit 230727c305d88560ec9d61a7048b0194a81650e2

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index 0116717..82c049e 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit 01167176ce6f6c663055f77ee01cb18793aa8ea5
+Subproject commit 82c049edee42af368a3758e1d8bb4ab1d0558298

diff --git a/docs/submodules/ccsdk/distribution.git b/docs/submodules/ccsdk/distribution.git
index 3535a63..9788155 160000 (submodule)
--- a/docs/submodules/ccsdk/distribution.git
+++ b/docs/submodules/ccsdk/distribution.git
@@ -1 +1 @@
-Subproject commit 3535a63cbbe1a41897a652bf1937368c9733cc90
+Subproject commit 9788155805ded9b76617e6c795c76b53f73426ec

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index b0eb298..f1d6990 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit b0eb2982ff2abccb178d378d9a6a6c9006559b84
+Subproject commit f1d69906060fe3ac9a2cccb6e0b4fd1c877452ad

diff --git a/docs/submodules/holmes/engine-management.git b/docs/submodules/holmes/engine-management.git
index a3950b1..bf652bc 160000 (submodule)
--- a/docs/submodules/holmes/engine-management.git
+++ b/docs/submodules/holmes/engine-management.git
@@ -1 +1 @@
-Subproject commit a3950b1227da2952b60920fec0bd87eef5791005
+Subproject commit bf652bc2ae7362eff1ab0a15b719465b296e4776

diff --git a/docs/submodules/holmes/rule-management.git b/docs/submodules/holmes/rule-management.git
index c066e7d..1b2e3a4 160000 (submodule)
--- a/docs/submodules/holmes/rule-management.git
+++ b/docs/submodules/holmes/rule-management.git
@@ -1 +1 @@
-Subproject commit c066e7d1f7cfbbe74a1e740a939bb268f4a92b3e
+Subproject commit 1b2e3a414826c059557845cbf6fd32eeb095f9b0

diff --git a/docs/submodules/multicloud/azure.git b/docs/submodules/multicloud/azure.git
index 9abc9c6..379a8ac 160000 (submodule)
--- a/docs/submodules/multicloud/azure.git
+++ b/docs/submodules/multicloud/azure.git
@@ -1 +1 @@
-Subproject commit 9abc9c644a96e74612a995b7194c69167317a6ae
+Subproject commit 379a8ac73b99ebc43b917d7128be0099c56e9619

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index 2dfba4b..b9844d0 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit 2dfba4b15af4fea7092dae1619cf985013b7a129
+Subproject commit b9844d09ce741d6993c479d7863f9dbfdd0d11c5

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index 3fec487..7d2d48d 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit 3fec487b6db21303516380dbd7635978164bb8a7
+Subproject commit 7d2d48d3d0b35de0acd03c6e8a1261efd736edc3

diff --git a/shell/smsummary.sh b/shell/smsummary.sh
index 0b971f8..2b1b776 100644 (file)
--- 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

diff --git a/tox.ini b/tox.ini
index d989407..44576ef 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -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 =