From 18dab6c658c8231a3d685505e9800ccc22de3203 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Thu, 5 Dec 2024 13:51:21 +0000 Subject: [PATCH 1/2] Zuul changes for PDF --- otc_metadata/templates/tox.ini.j2 | 2 +- otc_metadata/templates/zuul.yaml.j2 | 7 +++++++ tools/generate_doc_confpy.py | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2 index 1e2e21a0..b31a1bbf 100644 --- a/otc_metadata/templates/tox.ini.j2 +++ b/otc_metadata/templates/tox.ini.j2 @@ -44,7 +44,7 @@ commands = {[testenv:json-{{ doc.type }}]commands} {%- endfor %} -[testenv:docs-pdf] +[testenv:pdf-docs] deps = {[testenv:docs]deps} {[testenv:bindeps]deps} diff --git a/otc_metadata/templates/zuul.yaml.j2 b/otc_metadata/templates/zuul.yaml.j2 index 107ef29c..3b8ad364 100644 --- a/otc_metadata/templates/zuul.yaml.j2 +++ b/otc_metadata/templates/zuul.yaml.j2 @@ -4,6 +4,13 @@ default-branch: main templates: - helpcenter-base-jobs + vars: + sphinx_pdf_files: + {%- for doc in docs %} + {%- if doc.pdf_name %} + - {{ service_type }}-{{ doc.type }}.pdf + {%- endif %} + {%- endfor %} check: jobs: - noop diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index bada749d..a6e5cec4 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -299,6 +299,12 @@ def process_repositories(args, service): if args.update_zuul: """Update zuul.yaml""" + context = dict(docs=[]) + for doc in service_docs: + if doc["type"] == "dev": + doc["type"] = "dev-guide" + context["docs"].append(doc) + context["service_type"] = service['service_type'] zuul_yaml_content = zuul_yaml_template.render(**context) zuul_yaml_path = pathlib.Path(copy_to, "zuul.yaml") -- 2.34.1 From 6f1361fdecfef078095ed5992633acef7f0c0609 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Mon, 9 Dec 2024 10:10:44 +0000 Subject: [PATCH 2/2] Switch to PDF enabled --- otc_metadata/templates/zuul.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otc_metadata/templates/zuul.yaml.j2 b/otc_metadata/templates/zuul.yaml.j2 index 3b8ad364..f0f61120 100644 --- a/otc_metadata/templates/zuul.yaml.j2 +++ b/otc_metadata/templates/zuul.yaml.j2 @@ -7,7 +7,7 @@ vars: sphinx_pdf_files: {%- for doc in docs %} - {%- if doc.pdf_name %} + {%- if doc.pdf_enabled %} - {{ service_type }}-{{ doc.type }}.pdf {%- endif %} {%- endfor %} -- 2.34.1