Merge branch 'docs-quickfix' into 'staging'

Docs quickfix

See merge request !71

.gitlab-ci.yml

@@ -186,11 +186,13 @@ review-docs:
     auto_stop_in: 1 week
   variables:
     PUBLIC_URL: "/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public"
+    DOCS_VERSIONS: (1.3.4|1.2.0|1.1.1|1.0.0)
   only:
     - branches
   except:
     - master
     - staging
+  when: manual
 
 stop_review_app:
   stage: deploy
@@ -217,6 +219,8 @@ pages:
     - mv _build/html/ ../../public
     - cd ../user-guide && make build
     - mv _build/html/ ../../public/user
+  variables:
+    DOCS_VERSIONS: (1.3.4|1.2.0|1.1.1|1.0.0)
   artifacts:
     paths:
       - public

documentation/operator-guide/Makefile

@@ -21,7 +21,6 @@ html-watch:
 
 build:
 	@$(SPHINXMULTIBUILD) "$(SOURCEDIR)" "$(BUILDDIR)/html"
-	rm -rf _build/html/user* _build/html/operator*
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

documentation/operator-guide/conf.py

@@ -87,3 +87,7 @@ latex_documents = [(
 latex_elements = {
     'papersize': 'a4paper',
 }
+
+from os import environ
+smv_branch_whitelist = r'^master|^staging'
+smv_tag_whitelist = r'^release-' + environ.get('DOCS_VERSIONS', '.*')

documentation/user-guide/Makefile

@@ -32,7 +32,6 @@ build:
 	@$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	gs -sDEVICE=pdfwrite -dPDFSETTINGS=/ebook -dPrinted=false -q -o _build/latex/View-Server_-_User-Guide_small.pdf _build/latex/View-Server_-_User-Guide.pdf
 	rsync -rpE _build/latex/View-Server_-_User-Guide_small.pdf _build/html/View-Server_-_User-Guide.pdf
-	rm -rf _build/html/user* _build/html/operator*
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

documentation/user-guide/conf.py

@@ -86,3 +86,7 @@ latex_documents = [(
 latex_elements = {
     'papersize': 'a4paper',
 }
+
+from os import environ
+smv_branch_whitelist = r'^master|^staging'
+smv_tag_whitelist = r'^release-' + environ.get('DOCS_VERSIONS', '.*')