From 73cd22d012afc9adb773eee03b515c3d4b6d0a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Thu, 4 May 2023 15:33:58 +0200
Subject: [PATCH] [bodhi-backend] Move pungi general conf back to files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems that the change in Bodhi we did (see
https://github.com/fedora-infra/bodhi/pull/5154) can't work with templates.
Let's move the template parts back to corresponding configuration files.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 .../pungi.general.conf.j2 => files/pungi_general.conf} |  7 -------
 roles/bodhi2/backend/tasks/main.yml                    |  9 ++++++++-
 roles/bodhi2/backend/templates/pungi.module.conf.j2    | 10 ++++++++--
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2       |  7 +++++--
 4 files changed, 21 insertions(+), 12 deletions(-)
 rename roles/bodhi2/backend/{templates/pungi.general.conf.j2 => files/pungi_general.conf} (52%)

diff --git a/roles/bodhi2/backend/templates/pungi.general.conf.j2 b/roles/bodhi2/backend/files/pungi_general.conf
similarity index 52%
rename from roles/bodhi2/backend/templates/pungi.general.conf.j2
rename to roles/bodhi2/backend/files/pungi_general.conf
index 78bdedb2cc..efe1f06e7a 100644
--- a/roles/bodhi2/backend/templates/pungi.general.conf.j2
+++ b/roles/bodhi2/backend/files/pungi_general.conf
@@ -1,10 +1,3 @@
-# PRODUCT INFO
-release_name = '[[ release.id_prefix.title() ]]'
-release_short = '[[ release.id_prefix.title() ]]'
-release_is_layered = False
-
-hashed_directories = True
-
 # PKGSET
 pkgset_source = 'koji' # koji, repos
 filter_system_release_packages = False
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index b8e811f615..dd2b9a2d60 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -60,7 +60,6 @@
 - name: Put pungi configurations in place
   template: src="{{item}}" dest=/etc/bodhi/{{item}}
   with_items:
-  - pungi.general.conf.j2
   - pungi.module.conf.j2
   - pungi.rpm.conf.j2
   - variants.module.xml.j2
@@ -79,6 +78,14 @@
   - bodhi/pungi
   - config
 
+- name: Put pungi general configuration in place
+  copy:
+    src: pungi_general.conf
+    dest: /etc/bodhi/pungi_general.conf
+  tags:
+  - bodhi
+  - bodhi/pungi
+  - config
 #
 # koji ssl cert for owner sync jobs below
 #
diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2
index 420f56885c..7fa7e9e50a 100644
--- a/roles/bodhi2/backend/templates/pungi.module.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2
@@ -1,11 +1,17 @@
-# Import shared settings from pungi.general.conf
-from pungi.general import *
+# Import shared settings from pungi_general.conf
+from pungi_general import *
 # Import multilib settings from pungi_multilib.conf
 from pungi_multilib import *
 
 # PRODUCT INFO
 release_version = '[[ release.version ]]'
 release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
+release_is_layered = False
+
+hashed_directories = True
+
 
 # GENERAL SETTINGS
 bootable = False
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 2ebb08d4ad..1cd42cb107 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -1,5 +1,5 @@
-# Import shared settings from pungi.general.conf
-from pungi.general import *
+# Import shared settings from pungi_general.conf
+from pungi_general import *
 # Import multilib settings from pungi_multilib.conf
 from pungi_multilib import *
 
@@ -8,6 +8,9 @@ skip_phases = ["buildinstall", "extra_files"]
 release_version = '[[ release.version_int ]]'
 release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 old_composes_per_release_type = True
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
+release_is_layered = False
 
 # GENERAL SETTINGS
 comps_file = {