From d47e33fe615c553b1d1faf5d6a3b2d84149f2c79 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 26 Sep 2024 11:16:42 -0700
Subject: [PATCH] koji / staging: prep for koji 1.35 in staging

Only staging for now, will need to remove the if statements when we move
to prod. Drop some no longer used kojira config and add some that moved
to the hub.

See https://docs.pagure.org/koji/migrations/migrating_to_1.35/

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/koji_hub/templates/hub.conf.j2    | 6 ++++++
 roles/koji_hub/templates/kojira.conf.j2 | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index f9157d8323..4cda72b126 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -23,6 +23,12 @@ MemoryWarnThreshold = 10000
 MaxRequestLength = 167772160
 RLIMIT_AS = 10737418240
 CheckClientIP = False
+{% if env == "staging" %}
+# Max newrepo tasks at a time
+MaxRepoTasks = 30
+# We want a srpms repo for rawhide and eln only
+SeparateSourceTags = f{{ FedoraRawhideNumber }}-build eln-build
+{% endif %}
 
 # Kerb auth
 {% if env == "staging" %}
diff --git a/roles/koji_hub/templates/kojira.conf.j2 b/roles/koji_hub/templates/kojira.conf.j2
index 3a1f59c5eb..2f9bddac73 100644
--- a/roles/koji_hub/templates/kojira.conf.j2
+++ b/roles/koji_hub/templates/kojira.conf.j2
@@ -21,17 +21,21 @@ logfile=/var/log/kojira/kojira.log
 ; Include srpms in repos? (not needed for normal operation)
 with_src=no
 
+{% if env == "staging" %}
 ; We want a srpms repo for rawhide only
 separate_source_tags=f{{ FedoraRawhideNumber }}-build eln-build
+{% endif %}
 
 ; prevent repo cleanup from stalling repo regen
 ;prune_batch_size=1
 ;delete_batch_size=1
 max_delete_processes=20
 
+{% if env == "staging" %}
 ; prevent kojira from flooding the build system with newRepo tasks
 max_repo_tasks=30
 repo_tasks_limit=40
+{% endif %}
 
 ; Server certificate authority
 serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
@@ -52,9 +56,11 @@ dist_repo_lifetime = 7257600
 ; https://pagure.io/koji/issue/2159
 check_external_repos = True
 
+{% if env == "staging" %}
 ; Writable path could be set here. In such case, kojira will write a
 ; list of currently monitored tags there with simple statistics in
 ; every cycle. File would contain information about how long these
 ; tags are expired and what is the computed score for them. This can
 ; be used to debug and check in realtime the actual performance.
 queue_file = /mnt/koji/kojira/queue
+{% endif %}