prompt fix

Reviewed-on: #80
Reviewed-by: Tino Schreiber <tino.schreiber@t-systems.com>
Co-authored-by: Sebastian Gode <sebastian.gode@telekom.de>
Co-committed-by: Sebastian Gode <sebastian.gode@telekom.de>

otc_metadata/data/cloud_environments/eu_de.yaml

@@ -0,0 +1,10 @@
+---
+name: eu_de
+internal_org: docs
+public_org: opentelekomcloud-docs
+regions:
+  - eu-de
+affected_locations:
+  - "EU-DE-01 AZ1 (Germany/Biere)"
+  - "EU-DE-02 AZ2 (Germany/Magdeburg)"
+  - "EU-DE-03 AZ3 (Germany/Biere)"

otc_metadata/data/cloud_environments/swiss.yaml

@@ -0,0 +1,10 @@
+---
+name: swiss
+internal_org: docs-swiss
+public_org: opentelekomcloud-docs-swiss
+regions:
+  - eu-ch2
+affected_locations:
+  - "EU-CH2-01 SwissCloud AZ1 (Switzerland/Zollikofen)"
+  - "EU-CH2-02 SwissCloud AZ2 (Switzerland/Bern)"
+  - "EU-CH2-03 SwissCloud AZ3 (Switzerland/Zollikofen)"

otc_metadata/data/documents/apig-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/apig
 html_location: docs/apig/dev
 link: /api-gateway/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: apig
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: hidden

otc_metadata/data/documents/as-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/as
 html_location: docs/as/dev
 link: /auto-scaling/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: as
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/bms-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/bms
 html_location: docs/bms/dev
 link: /bare-metal-server/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: bms
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/dli-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dli
 html_location: docs/dli/dev
 link: /data-lake-insight/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: dli
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/dms-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dms
 html_location: docs/dms/dev
 link: /distributed-message-service/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: dms
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

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

@@ -0,0 +1,13 @@
+---
+hc_location: api/rabbitmq
+html_location: docs/dms_rabbitmq/api-ref
+link: /distributed-message-service-rabbitmq/api-ref/
+rst_location: api-ref/source
+service_type: dms_rabbitmq
+title: API Reference
+type: api-ref
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+    pdf_visibility: public
+    pdf_enabled: true

otc_metadata/data/documents/dms_rabbitmq-umn.yaml

@@ -0,0 +1,13 @@
+---
+hc_location: usermanual/rabbitmq
+html_location: docs/dms_rabbitmq/umn
+link: /distributed-message-service-rabbitmq/umn/
+rst_location: umn/source
+service_type: dms_rabbitmq
+title: User Guide
+type: umn
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+    pdf_visibility: public
+    pdf_enabled: true

otc_metadata/data/documents/dws-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/dws
 html_location: docs/dws/dev
 link: /data-warehouse-service/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: dws
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/ecs-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/ecs
 html_location: docs/ecs/dev
 link: /elastic-cloud-server/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: ecs
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/ed-alerting.yaml

@@ -6,6 +6,6 @@ title: Alerting
 type: alerting
 cloud_environments:
   - name: eu_de
-    visibility: hidden
+    visibility: public
-    pdf_visibility: hidden
+    pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/ed-sustainability.yaml

@@ -0,0 +1,11 @@
+---
+link: /enterprise-dashboard/sustainability/
+rst_location: doc/sustainability/source
+service_type: ed
+title: Sustainability
+type: sustainability
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: true

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

@@ -8,6 +8,6 @@ title: API Reference
 type: api-ref
 cloud_environments:
   - name: eu_de
-    visibility: internal
+    visibility: public
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/eps-umn.yaml

@@ -8,6 +8,6 @@ title: User Guide
 type: umn
 cloud_environments:
   - name: eu_de
-    visibility: internal
+    visibility: public
     pdf_visibility: public
     pdf_enabled: true

otc_metadata/data/documents/esw-umn.yaml

@@ -0,0 +1,13 @@
+---
+hc_location: usermanual/esw
+html_location: docs/esw/umn
+link: /enterprise-switch/umn/
+rst_location: umn/source
+service_type: esw
+title: User Guide
+type: umn
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: true

otc_metadata/data/documents/evs-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/evs
 html_location: docs/evs/dev
 link: /elastic-volume-service/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: evs
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/fg-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/functiongraph
 html_location: docs/fg/dev
 link: /function-graph/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: fg
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: internal

otc_metadata/data/documents/ims-dev.yaml

@@ -2,10 +2,10 @@
 hc_location: devg/ims
 html_location: docs/ims/dev
 link: /image-management-service/dev-guide/
-rst_location: dev_guide/source
+rst_location: doc/dev-guide/source
 service_type: ims
 title: Developer Guide
-type: dev
+type: dev-guide
 cloud_environments:
   - name: eu_de
     visibility: public

otc_metadata/data/documents/obs-tool-guide-obsutil.yaml

@@ -0,0 +1,13 @@
+---
+hc_location: utiltg/obs
+html_location: docs/obs/tool-obsutil
+link: /object-storage-service/tool-guide-obsutil/
+rst_location: doc/tool-obsutil/source
+service_type: obs
+title: Tool Guide (obsutil)
+type: tool-guide-obsutil
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: true

otc_metadata/data/documents/obs_3rd_party-dotnet-sdk.yaml

@@ -0,0 +1,13 @@
+---
+hc_location: sdk/dotnet-devg-obs
+html_location: docs/obs_3rd_party/dotnet_sdk
+link: /object-storage-service-3rd-party/dotnet-sdk/
+rst_location: doc/dotnet-sdk/source
+service_type: obs_3rd_party
+title: .NET SDK
+type: dotnet-sdk
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: false

otc_metadata/data/repositories/dms_rabbitmq.yaml

@@ -0,0 +1,13 @@
+---
+service_type: dms_rabbitmq
+repositories:
+  - environment: public
+    repo: opentelekomcloud-docs/distributed-message-service-rabbitmq
+    type: github
+    cloud_environments:
+      - eu_de
+  - environment: internal
+    repo: docs/distributed-message-service-rabbitmq
+    type: gitea
+    cloud_environments:
+      - eu_de

otc_metadata/data/repositories/esw.yaml

@@ -0,0 +1,13 @@
+---
+service_type: esw
+repositories:
+  - environment: public
+    repo: opentelekomcloud-docs/enterprise-switch
+    type: github
+    cloud_environments:
+      - eu_de
+  - environment: internal
+    repo: docs/enterprise-switch
+    type: gitea
+    cloud_environments:
+      - eu_de

otc_metadata/data/services.yaml

@@ -17,6 +17,7 @@
 # documents/services/service_categories is being merged with
 # the content here.
 ---
+cloud_environments: []
 documents: []
 service_categories: []
 services: []

otc_metadata/data/services/dms_rabbitmq.yaml

@@ -0,0 +1,12 @@
+---
+service_category: application
+service_title: Distributed Message Service (for RabbitMQ)
+service_type: dms_rabbitmq
+service_uri: distributed-message-service-rabbitmq
+teams:
+  - name: docs-paas-rw
+    permission: write
+cloud_environments:
+  - name: eu_de
+    visibility: internal
+is_global: false

otc_metadata/data/services/eps.yaml

@@ -1,5 +1,5 @@
 ---
-service_category: security-services
+service_category: md
 service_title: Enterprise Project Service
 service_type: eps
 service_uri: enterprise-project-service
@@ -8,5 +8,5 @@ teams:
     permission: write
 cloud_environments:
   - name: eu_de
-    visibility: internal
+    visibility: public
 is_global: false

otc_metadata/data/services/esw.yaml

@@ -0,0 +1,12 @@
+---
+service_category: network
+service_title: Enterprise Switch
+service_type: esw
+service_uri: enterprise-switch
+teams:
+  - name: docs-network-rw
+    permission: write
+cloud_environments:
+  - name: eu_de
+    visibility: public
+is_global: false

otc_metadata/services.py

@@ -62,10 +62,20 @@ class Services(object):
         if other in self._service_data["service_categories"]:
             self._service_data["service_categories"].remove(other)
             self._service_data["service_categories"].append(other)
+        # sort cloud environments by <name>
+        self._service_data["cloud_environments"] = sorted(
+            self._service_data["cloud_environments"],
+            key=lambda x: f"{x.get('name')}",
+        )
 
     def _rewrite_data(self):
         otc_metadata.data.rewrite_data("services.yaml", self._service_data)
 
+    @property
+    def all_cloud_environments(self):
+        "Cloud Environments data listing."
+        return copy.deepcopy(self._service_data["cloud_environments"])
+
     @property
     def all_services(self):
         "Service Categories data listing."

otc_metadata/templates/build-html-docs.yaml.j2

@@ -6,17 +6,33 @@ jobs:
   tox-docs:
     runs-on: ubuntu-latest
     steps:
+      {%- if environment == 'internal' %}
       - uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
         with:
           tox-env: docs
           
       - name: Upload documentation preview
+        {% raw -%}
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+        {%- endraw %}
         uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
+      {%- elif environment == 'public' %}
+      - uses: opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
+        with:
+          tox-env: docs
+          
+      - name: Upload documentation preview
+        {% raw -%}
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+        {%- endraw %}
+        uses: opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
+      {%- endif %}
         with:
           docs_path: "doc/build/html"
           docs_service: {{ service_uri }}
-          swift_container: "gitea_action_logs"
+          {%- if environment == 'internal' %}
           {% raw -%}
+          swift_container: "gitea_action_logs"
           otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }}
           otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }}
           otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }}
@@ -27,4 +43,20 @@ jobs:
           repo: ${{ gitea.repository }}
           pr_number: ${{ gitea.event.pull_request.number }}
           run_id: ${{ gitea.run_id }}
+          ci_platform: gitea
           {%- endraw %}
+          {%- elif environment == 'public' %}
+          {% raw -%}
+          swift_container: "gh_action_logs"
+          otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }}
+          otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }}
+          otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }}
+          otc_swift_domain: ${{ secrets.OTC_SWIFT_DOMAIN }}
+          otc_swift_endpoint: ${{ secrets.OTC_SWIFT_ENDPOINT }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          repo: ${{ github.repository }}
+          pr_number: ${{ github.event.pull_request.number }}
+          run_id: ${{ github.run_id }}
+          ci_platform: github
+          {%- endraw %}
+          {%- endif %}

otc_metadata/templates/build-pdf-docs.yaml.j2

@@ -6,17 +6,33 @@ jobs:
   tox-pdf-docs:
     runs-on: ubuntu-latest
     steps:
+      {%- if environment == 'internal' %}
       - uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
         with:
           tox-env: pdf-docs
           
       - name: Upload documentation preview
+        {% raw -%}
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+        {%- endraw %}
         uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
+      {%- elif environment == 'public' %}
+      - uses: opentelekomcloud-infra/github-actions/.github/actions/tox-run-env@v1
+        with:
+          tox-env: pdf-docs
+          
+      - name: Upload documentation preview
+        {% raw -%}
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+        {%- endraw %}
+        uses: opentelekomcloud-infra/github-actions/.github/actions/tox-upload-swift@v1
+      {%- endif %}
         with:
           docs_path: "doc/build/pdf"
           docs_service: {{ service_uri }}
-          swift_container: "gitea_action_logs"
+          {%- if environment == 'internal' %}
           {% raw -%}
+          swift_container: "gitea_action_logs"
           otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }}
           otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }}
           otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }}
@@ -27,4 +43,20 @@ jobs:
           repo: ${{ gitea.repository }}
           pr_number: ${{ gitea.event.pull_request.number }}
           run_id: ${{ gitea.run_id }}
+          ci_platform: gitea
           {%- endraw %}
+          {%- elif environment == 'public' %}
+          {% raw -%}
+          swift_container: "gh_action_logs"
+          otc_swift_username: ${{ secrets.OTC_SWIFT_USERNAME }}
+          otc_swift_password: ${{ secrets.OTC_SWIFT_PASSWORD }}
+          otc_swift_project_name: ${{ secrets.OTC_SWIFT_PROJECT_NAME }}
+          otc_swift_domain: ${{ secrets.OTC_SWIFT_DOMAIN }}
+          otc_swift_endpoint: ${{ secrets.OTC_SWIFT_ENDPOINT }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          repo: ${{ github.repository }}
+          pr_number: ${{ github.event.pull_request.number }}
+          run_id: ${{ github.run_id }}
+          ci_platform: github
+          {%- endraw %}
+          {%- endif %}

otc_metadata/templates/tox.ini.j2

@@ -152,7 +152,7 @@ commands =
     rm -rf {toxinidir}/packages.txt
     wget -O {toxinidir}/bindep.txt https://raw.githubusercontent.com/opentelekomcloud/otcdocstheme/main/bindep.txt
     bash -c "bindep test -b -f {toxinidir}/bindep.txt > {toxinidir}/packages.txt || true"
-    bash -c 'if [ -s {toxinidir}/packages.txt ]; then if command -v apt &>/dev/null; then apt update && xargs apt install --no-install-recommends -y < {toxinidir}/packages.txt; fi; fi'
+    bash -c 'if [ -s {toxinidir}/packages.txt ]; then if command -v apt &>/dev/null; then sudo apt update && xargs sudo apt install --no-install-recommends -y < {toxinidir}/packages.txt; fi; fi'
     bash -c 'if [ -s {toxinidir}/packages.txt ]; then if command -v dnf &>/dev/null; then dnf install -y $(cat {toxinidir}/packages.txt); fi; fi'
 
 [doc8]

test-requirements.txt

@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-stestr>=2.0.0 # Apache-2.0
+pytest
-testtools>=2.2.0 # MIT
+pytest-cov
 flake8
+pyyaml

tools/generate_doc_confpy.py

@@ -356,8 +356,10 @@ def process_repositories(args, service):
                     context["docs"].append(doc)
         if args.cloud_environment == "swiss":
             context["template"] = "helpcenter-swiss-base-jobs"
-        elif args.cloud_environment == "eu_de":
+        elif args.cloud_environment == "eu_de" and args.target_environment == "internal":
             context["template"] = "helpcenter-base-jobs"
+        elif args.cloud_environment == "eu_de" and args.target_environment == "public":
+            context["template"] = "helpcenter-base-jobs-no-check"
         context["service_type"] = service['service_type']
 
         zuul_yaml_content = zuul_yaml_template.render(**context)
@@ -371,21 +373,33 @@ def process_repositories(args, service):
         """Update actions"""
         context = dict(docs=[])
         context["service_uri"] = service['service_uri']
+        context["environment"] = args.target_environment
 
         actions_yaml_content_html = actions_yaml_template_html.render(**context)
         actions_yaml_content_pdf = actions_yaml_template_pdf.render(**context)
+        if args.target_environment == "internal":
             actions_yaml_content_html_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-html-docs.yaml")
             actions_yaml_content_html_path.parent.mkdir(parents=True, exist_ok=True)
             actions_yaml_content_pdf_path = pathlib.Path(copy_to, ".gitea", "workflows", "build-pdf-docs.yaml")
             actions_yaml_content_pdf_path.parent.mkdir(parents=True, exist_ok=True)
+        elif args.target_environment == "public":
+            actions_yaml_content_html_path = pathlib.Path(copy_to, ".github", "workflows", "build-html-docs.yaml")
+            actions_yaml_content_html_path.parent.mkdir(parents=True, exist_ok=True)
+            actions_yaml_content_pdf_path = pathlib.Path(copy_to, ".github", "workflows", "build-pdf-docs.yaml")
+            actions_yaml_content_pdf_path.parent.mkdir(parents=True, exist_ok=True)
+
         with open(actions_yaml_content_html_path, "w", encoding="utf-8", newline="") as out:
             logging.debug(f"Generating {actions_yaml_content_html_path} from template...")
             out.write(actions_yaml_content_html)
-        repo_to.index.add([".gitea/workflows/build-html-docs.yaml"])
         with open(actions_yaml_content_pdf_path, "w", encoding="utf-8", newline="") as out:
             logging.debug(f"Generating {actions_yaml_content_pdf_path} from template...")
             out.write(actions_yaml_content_pdf)
+        if args.target_environment == "internal":
+            repo_to.index.add([".gitea/workflows/build-html-docs.yaml"])
             repo_to.index.add([".gitea/workflows/build-pdf-docs.yaml"])
+        elif args.target_environment == "public":
+            repo_to.index.add([".github/workflows/build-html-docs.yaml"])
+            repo_to.index.add([".github/workflows/build-pdf-docs.yaml"])
 
     if len(repo_to.index.diff("HEAD")) == 0:
         # Nothing to commit

tox.ini

@@ -9,7 +9,7 @@ usedevelop = True
 setenv =
    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+commands = pytest {posargs}
 
 [testenv:pep8]
 commands = flake8 {posargs}