Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

koji / staging: prep for koji 1.35 in staging

Browse source 
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>
This commit is contained in:
Kevin Fenzi 2024-09-26 11:16:42 -07:00
parent 8f958b859b
commit d47e33fe61
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/koji_hub/templates/hub.conf.j2
View file

@ -23,6 +23,12 @@ MemoryWarnThreshold = 10000
MaxRequestLength = 167772160 MaxRequestLength = 167772160
RLIMIT_AS = 10737418240 RLIMIT_AS = 10737418240
CheckClientIP = False 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 # Kerb auth
{% if env == "staging" %} {% if env == "staging" %}

6
roles/koji_hub/templates/kojira.conf.j2
View file

@ -21,17 +21,21 @@ logfile=/var/log/kojira/kojira.log
; Include srpms in repos? (not needed for normal operation) ; Include srpms in repos? (not needed for normal operation)
with_src=no with_src=no
{% if env == "staging" %}
; We want a srpms repo for rawhide only ; We want a srpms repo for rawhide only
separate_source_tags=f{{ FedoraRawhideNumber }}-build eln-build separate_source_tags=f{{ FedoraRawhideNumber }}-build eln-build
{% endif %}
; prevent repo cleanup from stalling repo regen ; prevent repo cleanup from stalling repo regen
;prune_batch_size=1 ;prune_batch_size=1
;delete_batch_size=1 ;delete_batch_size=1
max_delete_processes=20 max_delete_processes=20
{% if env == "staging" %}
; prevent kojira from flooding the build system with newRepo tasks ; prevent kojira from flooding the build system with newRepo tasks
max_repo_tasks=30 max_repo_tasks=30
repo_tasks_limit=40 repo_tasks_limit=40
{% endif %}
; Server certificate authority ; Server certificate authority
serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem 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 ; https://pagure.io/koji/issue/2159
check_external_repos = True check_external_repos = True
{% if env == "staging" %}
; Writable path could be set here. In such case, kojira will write a ; Writable path could be set here. In such case, kojira will write a
; list of currently monitored tags there with simple statistics in ; list of currently monitored tags there with simple statistics in
; every cycle. File would contain information about how long these ; every cycle. File would contain information about how long these
; tags are expired and what is the computed score for them. This can ; tags are expired and what is the computed score for them. This can
; be used to debug and check in realtime the actual performance. ; be used to debug and check in realtime the actual performance.
queue_file = /mnt/koji/kojira/queue queue_file = /mnt/koji/kojira/queue
{% endif %}