From 10789ceba2bcb92464a4b3fb2e6660c283bd8ca3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 18 Mar 2025 19:37:38 +0100
Subject: [PATCH] Koschei: Move away from deprecated fedmsg_env variable

---
 .../openshift-apps/koschei/templates/config-backend.cfg.j2  | 4 ++--
 .../koschei/templates/fedora-messaging.toml.j2              | 6 +++---
 roles/openshift-apps/koschei/vars/production.yml            | 2 ++
 roles/openshift-apps/koschei/vars/staging.yml               | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/openshift-apps/koschei/templates/config-backend.cfg.j2 b/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
index d39427bd43..c265682be9 100644
--- a/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
+++ b/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
@@ -101,7 +101,7 @@ config = {
     "plugins": ['fedmsg'],
     {% endif %}
     "fedmsg": {
-        "topic": "org.fedoraproject.{{ fedmsg_env }}.buildsys",
+        "topic": "{{ koschei_topic_prefix }}.buildsys",
     },
     "fedmsg-publisher": {
         "enabled": True,
@@ -139,7 +139,7 @@ config = {
         "config_path": "/etc/koschei/copr-config",
         "overriding_by_exclusions": False,
         "max_builds": 2,
-        "fedmsg_topic": "org.fedoraproject.{{ fedmsg_env }}.copr.build.end",
+        "fedmsg_topic": "{{ koschei_topic_prefix }}.copr.build.end",
         "default_schedule_count": 8,
         "name_prefix": "k",
         "require_admin": True,
diff --git a/roles/openshift-apps/koschei/templates/fedora-messaging.toml.j2 b/roles/openshift-apps/koschei/templates/fedora-messaging.toml.j2
index cc73dd455e..5f7f1b4d5a 100644
--- a/roles/openshift-apps/koschei/templates/fedora-messaging.toml.j2
+++ b/roles/openshift-apps/koschei/templates/fedora-messaging.toml.j2
@@ -1,5 +1,5 @@
 amqp_url = "amqps://koschei{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
-topic_prefix = "org.fedoraproject.{{ fedmsg_env }}"
+topic_prefix = "{{ koschei_topic_prefix }}"
 passive_declares = true
 
 [tls]
@@ -23,6 +23,6 @@ arguments = {}
 queue = "koschei{{ env_suffix }}"
 exchange = "amq.topic"
 routing_keys = [
-  "org.fedoraproject.{{ fedmsg_env }}.buildsys.tag",
-  "org.fedoraproject.{{ fedmsg_env }}.buildsys.task.state.change",
+  "{{ koschei_topic_prefix }}.buildsys.tag",
+  "{{ koschei_topic_prefix }}.buildsys.task.state.change",
 ]
diff --git a/roles/openshift-apps/koschei/vars/production.yml b/roles/openshift-apps/koschei/vars/production.yml
index da7c1a6abf..f58be423e7 100644
--- a/roles/openshift-apps/koschei/vars/production.yml
+++ b/roles/openshift-apps/koschei/vars/production.yml
@@ -25,6 +25,8 @@ koschei_pgsql_admin_password: "{{ koscheiadmin_db_password }}"
 koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_prod }}"
 koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_prod }}"
 
+koschei_topic_prefix: org.fedoraproject.prod
+
 koschei_frontend_replicas: 3
 
 koschei_backend_services:
diff --git a/roles/openshift-apps/koschei/vars/staging.yml b/roles/openshift-apps/koschei/vars/staging.yml
index eca399e9e7..11dba6dd3c 100644
--- a/roles/openshift-apps/koschei/vars/staging.yml
+++ b/roles/openshift-apps/koschei/vars/staging.yml
@@ -25,6 +25,8 @@ koschei_pgsql_admin_password: "{{ koscheiadmin_stg_db_password }}"
 koschei_oidc_client_secret: "{{ koschei_oidc_client_secret_stg }}"
 koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_stg }}"
 
+koschei_topic_prefix: org.fedoraproject.stg
+
 koschei_frontend_replicas: 2
 
 koschei_backend_services: