zlopez/ansible
1
0
Fork 0
forked from infra/ansible
Code Pull requests Activity

koji: remove osbuild plugin configuration

Browse source 
This is part of an approved change [1] to remove `koji-osbuild` from
Fedora's Koji instances. In this commit the Koji configuration is
changed to no longer serve `osbuildImage` tasks in web or hub.

The `koji-osbuild` plugin has been replaced previously with the
`koji-image-builder` plugin which, instead of talking to a remotely
hosted service, builds images on Koji builders themselves.

All users of `koji-osbuild` have been migrated to `koji-image-builder`
and no builds are being scheduled that need to be handled by
`koji-osbuild` anymore.

[1]: https://fedoraproject.org/wiki/Changes/KojiServiceImageBuilderRemoval

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This commit is contained in:
Simon de Vlieger 2025-11-19 07:49:34 +01:00 • committed by kevin
commit 28daeaad95
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,11 +113,11 @@ MissingPolicyOk = False
#Plugins = koji-disable-builds-plugin
#Plugins = darkserver-plugin
{% if env == "staging" %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
Plugins = koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% elif koji_instance == "primary" %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
Plugins = koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% else %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
Plugins = koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% endif %}
[policy]
@ -159,7 +159,6 @@ tag =
}
channel =
method osbuildImage :: use osbuild
method buildContainer :: use container
method flatpakBuild :: use flatpak
user bpeck/jenkins-continuous-infra.apps.ci.centos.org :: use ci

14
roles/koji_hub/templates/web.conf.j2
View file

@ -42,13 +42,13 @@ loginDisabled = True
KojiHubCA = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
{% if env == 'staging' %}
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
Tasks = flatpakBuild,flatpakBuildArch,runroot,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,kiwiBuild,imageBuilderBuild
{% elif koji_instance == "primary" %}
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
Tasks = flatpakBuild,flatpakBuildArch,runroot,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,kiwiBuild,imageBuilderBuild
{% else %}
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
Tasks = flatpakBuild,flatpakBuildArch,runroot,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,kiwiBuild,imageBuilderBuild
{% endif %}
ToplevelTasks = flatpakBuild,osbuildImage
ToplevelTasks = flatpakBuild