From 3b4fb9417d7f0d50d17230207983d22da3386542 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 17 Jan 2024 09:16:46 +0000 Subject: [PATCH 1/3] Zuul --- otc_metadata/templates/zuul.yaml.j2 | 11 +++++++++++ tools/generate_doc_confpy.py | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 otc_metadata/templates/zuul.yaml.j2 diff --git a/otc_metadata/templates/zuul.yaml.j2 b/otc_metadata/templates/zuul.yaml.j2 new file mode 100644 index 00000000..a74378ab --- /dev/null +++ b/otc_metadata/templates/zuul.yaml.j2 @@ -0,0 +1,11 @@ +- project: + merge-mode: squash-merge + default-branch: main + templates: + - helpcenter-base-jobs + check: + jobs: + - noop + gate: + jobs: + - noop \ No newline at end of file diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py index 6939f894..174148ac 100644 --- a/tools/generate_doc_confpy.py +++ b/tools/generate_doc_confpy.py @@ -50,6 +50,7 @@ def process_repositories(args, service): ) conf_py_template = env.get_template("conf.py.j2") tox_ini_template = env.get_template("tox.ini.j2") + zuul_yaml_template = env.get_template("zuul.yaml.j2") index_sbv_template = env.get_template("index_sbv.rst.j2") doc_requirements_template = env.get_template("doc_requirements.txt.j2") @@ -259,6 +260,16 @@ def process_repositories(args, service): out.write(doc_requirements_content) repo_to.index.add(["doc/requirements.txt"]) + if args.update_zuul: + """Update zuul.yaml""" + + zuul_yaml_content = zuul_yaml_template.render(**context) + zuul_yaml_path = pathlib.Path(copy_to, "zuul.yaml") + with open(zuul_yaml_path, "w", encoding="utf-8", newline="") as out: + logging.debug(f"Generating {zuul_yaml_path} from template...") + out.write(zuul_yaml_content) + repo_to.index.add(["zuul.yaml"]) + if len(repo_to.index.diff("HEAD")) == 0: # Nothing to commit logging.debug( @@ -344,6 +355,11 @@ def main(): action="store_true", help="Whether to update service-based-view" ) + parser.add_argument( + "--update-zuul", + action="store_true", + help="Whether to update zuul.yaml" + ) parser.add_argument( "--overwrite-index-sbv", action="store_true", -- 2.34.1 From a6264e059f3ef6c82f4e249ad280ad7072d36b72 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 17 Jan 2024 09:18:32 +0000 Subject: [PATCH 2/3] Update zuul.yaml.j2 --- otc_metadata/templates/zuul.yaml.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/otc_metadata/templates/zuul.yaml.j2 b/otc_metadata/templates/zuul.yaml.j2 index a74378ab..21280af1 100644 --- a/otc_metadata/templates/zuul.yaml.j2 +++ b/otc_metadata/templates/zuul.yaml.j2 @@ -1,11 +1,12 @@ +--- - project: merge-mode: squash-merge default-branch: main templates: - - helpcenter-base-jobs + - helpcenter-base-jobs check: - jobs: + jobs: - noop gate: - jobs: + jobs: - noop \ No newline at end of file -- 2.34.1 From 18b22a6f5162c71785df765fd87662e7005bcd4e Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 17 Jan 2024 09:20:41 +0000 Subject: [PATCH 3/3] Update zuul.yaml.j2 --- otc_metadata/templates/zuul.yaml.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/otc_metadata/templates/zuul.yaml.j2 b/otc_metadata/templates/zuul.yaml.j2 index 21280af1..107ef29c 100644 --- a/otc_metadata/templates/zuul.yaml.j2 +++ b/otc_metadata/templates/zuul.yaml.j2 @@ -3,10 +3,10 @@ merge-mode: squash-merge default-branch: main templates: - - helpcenter-base-jobs + - helpcenter-base-jobs check: - jobs: + jobs: - noop gate: - jobs: + jobs: - noop \ No newline at end of file -- 2.34.1