Auto copy PDFs to HTML folder for Zuul to upload

otc_metadata/data/documents/apiu-guidelines.yaml

@@ -1,4 +1,5 @@
 ---
+environment: internal
 hc_location: api-usage/guidelines
 html_location: docs/apiu/guidelines
 link: /api-usage/guidelines/

otc_metadata/data/documents/asm-api-ref.yaml

@@ -1,5 +1,5 @@
 ---
-environment: public
+environment: internal
 hc_location: api/asm
 html_location: docs/asm/api-ref
 link: /application-service-mesh/api-ref/

otc_metadata/data/documents/das-api-ref.yaml

@@ -1,11 +0,0 @@
----
-hc_location: api/das
-environment: internal
-html_location: docs/das/api-ref
-link: /data-admin-service/api-ref/
-pdf_enabled: true
-pdf_environment: internal
-rst_location: api-ref/source
-service_type: das
-title: API Reference
-type: api-ref

otc_metadata/data/documents/das-umn.yaml

@@ -1,11 +0,0 @@
----
-hc_location: usermanual/das
-environment: internal
-html_location: docs/das/umn
-link: /data-admin-service/umn/
-pdf_enabled: true
-pdf_environment: internal
-rst_location: umn/source
-service_type: das
-title: User Guide
-type: umn

otc_metadata/data/documents/dbss-api-ref.yaml

@@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: api/dbss
 html_location: docs/dbss/api-ref
 link: /database-security-service/api-ref/

otc_metadata/data/documents/rfs-umn.yaml

@@ -1,10 +1,10 @@
 ---
 hc_location: usermanual/aos
-environment: public
+environment: internal
 html_location: docs/rfs/umn
 link: /resource-formation-service/umn/
-pdf_environment: internal
 pdf_enabled: true
+pdf_environment: internal
 rst_location: umn/source
 service_type: rfs
 title: User Guide

otc_metadata/data/services/apiu.yaml

@@ -1,5 +1,5 @@
 ---
-environment: hidden
+environment: internal
 repositories:
 - environment: internal
   repo: docs/api-usage

otc_metadata/data/services/das.yaml

@@ -1,16 +0,0 @@
----
-environment: internal
-repositories:
-- environment: internal
-  repo: docs/data-admin-service
-  type: gitea
-- environment: public
-  repo: opentelekomcloud-docs/data-admin-service
-  type: github
-service_category: database
-service_title: Data Admin Service
-service_type: das
-service_uri: data-admin-service
-teams:
-- name: docs-database-rw
-  permission: write

otc_metadata/data/services/rfs.yaml

@@ -1,5 +1,5 @@
 ---
-environment: public
+environment: internal
 repositories:
 - environment: internal
   repo: docs/resource-formation-service
@@ -7,7 +7,7 @@ repositories:
 - environment: public
   repo: opentelekomcloud-docs/resource-formation-service
   type: github
-service_category: md
+service_category: application
 service_title: Resource Formation Service
 service_type: rfs
 service_uri: resource-formation-service

otc_metadata/templates/tox.ini.j2

@@ -123,9 +123,9 @@ commands =
   rm -rf {{ loc }}/build/pdf
   cp -r {toxinidir}/_templates {{ loc }}/source/_templates/
   sphinx-build -W --keep-going -b latex {{ loc }}/source {{ loc }}/build/pdf/
-  bash -c "for f in {{ loc }}/build/pdf/*.gif; do convert $f[0] $\{f/%gif/png\}; done || true"
+  bash -c "for f in {{ loc }}/build/pdf/*.gif; do convert $f $\{f/%gif/png\}; done || true"
   bash -c "for f in {{ loc }}/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done"
-  make -C {{ loc }}/build/pdf LATEXMKOPTS="-interaction=nonstopmode"
+  make -C {{ loc }}/build/pdf
   mkdir -p doc/build/pdf
   cp {{ loc }}/build/pdf/{{ service_type }}-{{ doc.type }}.pdf doc/build/pdf/
   cp {{ loc }}/build/pdf/{{ service_type }}-{{ doc.type }}.pdf doc/build/html/

tools/generate_doc_confpy.py

@@ -167,17 +167,8 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "public"
+        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+           and target_repo["repo"].split("/")[0] == "docs-swiss"):
-            context["html_options"] = dict(
-                logo_url="https://docs.sc.otc.t-systems.com",
-            )
-        elif (args.target_environment == "public"):
-            context["html_options"] = dict(
-                logo_url="https://docs.otc.t-systems.com",
-            )
-        elif (args.target_environment == "internal"
-              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
@@ -233,17 +224,8 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "public"
+        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+           and target_repo["repo"].split("/")[0] == "docs-swiss"):
-            context["html_options"] = dict(
-                logo_url="https://docs.sc.otc.t-systems.com",
-            )
-        elif (args.target_environment == "public"):
-            context["html_options"] = dict(
-                logo_url="https://docs.otc.t-systems.com",
-            )
-        elif (args.target_environment == "internal"
-              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",

tox.ini

@@ -20,6 +20,6 @@ commands = {posargs}
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125,W503,E501
+ignore = E123,E125,W503
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build