From 85fdad945f0afaf8b1d94f8bdfaa15254f8ef695 Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Wed, 19 Jul 2023 17:28:41 -0600 Subject: [PATCH] Chore: add new lines required by pre-commit Signed-off-by: Kevin Sandi Change-Id: I659776622fefceb233f3a444ec38f5174a5d5054 --- lftools/git/gerrit.py | 12 +++++++++--- .../notes/pre-commit-fix-newlines-4c37e32a618b2483.yaml | 5 +++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/pre-commit-fix-newlines-4c37e32a618b2483.yaml diff --git a/lftools/git/gerrit.py b/lftools/git/gerrit.py index ebf890f6..0bc8a314 100644 --- a/lftools/git/gerrit.py +++ b/lftools/git/gerrit.py @@ -160,7 +160,9 @@ class Gerrit: else: buildnode = "centos7-builder-2c-1g" - jinja_env = Environment(loader=PackageLoader("lftools.git"), autoescape=select_autoescape()) + jinja_env = Environment( + loader=PackageLoader("lftools.git"), autoescape=select_autoescape(), keep_trailing_newline=True + ) template = jinja_env.get_template("project.yaml") content = template.render( project_name_dashed=gerrit_project_dashed, @@ -186,7 +188,9 @@ class Gerrit: """ filename = ".gitreview" - jinja_env = Environment(loader=PackageLoader("lftools.git"), autoescape=select_autoescape()) + jinja_env = Environment( + loader=PackageLoader("lftools.git"), autoescape=select_autoescape(), keep_trailing_newline=True + ) template = jinja_env.get_template("gitreview") content = template.render(fqdn=fqdn, project_name=gerrit_project, default_branch=self.default_branch) log.debug(".gitreview contents:\n{}".format(content)) @@ -239,7 +243,9 @@ class Gerrit: except AttributeError: log.error("Invalid nexus3_ports designated.") - jinja_env = Environment(loader=PackageLoader("lftools.git"), autoescape=select_autoescape()) + jinja_env = Environment( + loader=PackageLoader("lftools.git"), autoescape=select_autoescape(), keep_trailing_newline=True + ) template = jinja_env.get_template(params_path) config_params_content = template.render(project_dashed=project_dashed) log.debug("config-params.yaml contents:\n{}".format(config_params_content)) diff --git a/releasenotes/notes/pre-commit-fix-newlines-4c37e32a618b2483.yaml b/releasenotes/notes/pre-commit-fix-newlines-4c37e32a618b2483.yaml new file mode 100644 index 00000000..507ea519 --- /dev/null +++ b/releasenotes/notes/pre-commit-fix-newlines-4c37e32a618b2483.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Adds new lines at EOF of templates used by lftools to generate automated + Gerrit changes after a new INFO.yaml is merged. -- 2.16.6