infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

koji: some more containerbuild removal cleanup

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2025-01-27 15:27:58 -08:00
parent 8b763ae6ab
commit 3938bd35e2
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,11 +113,11 @@ MissingPolicyOk = False
#Plugins = koji-disable-builds-plugin #Plugins = koji-disable-builds-plugin
#Plugins = darkserver-plugin #Plugins = darkserver-plugin
{% if env == "staging" %} {% if env == "staging" %}
Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
{% elif koji_instance == "primary" %} {% elif koji_instance == "primary" %}
Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
{% else %} {% else %}
Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
{% endif %} {% endif %}
[policy] [policy]

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

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